From 82833f4ec683ec93cdc18113cbc76bc8be3fdc12 Mon Sep 17 00:00:00 2001
From: Nakilon <nakilon@gmail.com>
Date: Fri, 16 May 2014 10:13:37 +0400
Subject: [PATCH 1/2] some more proper Ruby in reader.rb

---
 lib/robjc/reader.rb | 36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/lib/robjc/reader.rb b/lib/robjc/reader.rb
index 3bd6074..7c25fdd 100644
--- a/lib/robjc/reader.rb
+++ b/lib/robjc/reader.rb
@@ -29,17 +29,13 @@ def self.projects
     end
 
     def self.targets
-      projects.map do |p|
-        p.targets
-      end.flatten.select do |t|
+      projects.map(&:targets).flatten.select do |t|
         t.is_a? Xcodeproj::Project::Object::PBXNativeTarget
       end
     end
 
     def files
-      @files ||= target.build_phases.map do |phase|
-        phase.files
-      end.flatten.map do |file|
+      @files ||= target.build_phases.map(&:files).flatten.map do |file|
         file.file_ref.real_path.to_s
       end
     end
@@ -47,50 +43,36 @@ def files
     private
 
     def images
-      files.select do |f|
-        next false if f.match /\.xcassets/i
-        f.match /\.png$/i
-      end
+      files.reject{ |f| f.match /\.xcassets/i }.grep /\.png$/i
     end
 
     def strings
-      files.select do |f|
-        f.match /\.strings$/i
-      end.map do |f|
+      files.grep(/\.strings$/i).map do |f|
         Resources::StringResource.new(f)
       end
     end
 
     def nibs
-      files.select do |f|
-        f.match /\.nib$/
+      files.grep /\.nib$/
       end
     end
 
     def storyboards
-      files.select do |f|
-        f.match /\.storyboard$/i
-      end
+      files.grep /\.storyboard$/i
     end
 
     def asset_catalogs
-      files.select do |f|
-        f.match /.xcassets$/i
-      end.map do |f|
+      files.grep(/.xcassets$/i).map do |f|
         Resources::AssetCatalogResource.new(f)
       end
     end
 
     def json_files
-      files.select do |f|
-        f.match /\.json$/i
-      end
+      files.grep /\.json$/i
     end
 
     def plists
-      files.select do |f|
-        f.match /\.plist$/i
-      end
+      files.grep /\.plist$/i
     end
 
   end

From b837ed66f34c3eddf4b82b6189c06e984ed6c857 Mon Sep 17 00:00:00 2001
From: Nakilon <nakilon@gmail.com>
Date: Fri, 16 May 2014 10:18:17 +0400
Subject: [PATCH 2/2] parentheses around regexes

this is easier for later maintenance
---
 lib/robjc/reader.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/robjc/reader.rb b/lib/robjc/reader.rb
index 7c25fdd..da264bb 100644
--- a/lib/robjc/reader.rb
+++ b/lib/robjc/reader.rb
@@ -43,7 +43,7 @@ def files
     private
 
     def images
-      files.reject{ |f| f.match /\.xcassets/i }.grep /\.png$/i
+      files.reject{ |f| f.match(/\.xcassets/i) }.grep(/\.png$/i)
     end
 
     def strings
@@ -53,12 +53,12 @@ def strings
     end
 
     def nibs
-      files.grep /\.nib$/
+      files.grep(/\.nib$/)
       end
     end
 
     def storyboards
-      files.grep /\.storyboard$/i
+      files.grep(/\.storyboard$/i)
     end
 
     def asset_catalogs
@@ -68,11 +68,11 @@ def asset_catalogs
     end
 
     def json_files
-      files.grep /\.json$/i
+      files.grep(/\.json$/i)
     end
 
     def plists
-      files.grep /\.plist$/i
+      files.grep(/\.plist$/i)
     end
 
   end