sbconstants 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb8940858c1fdaa712d60cb4b79702cebbcdfcef
-  data.tar.gz: db0274ce5f165d3daef24d5f4f38959dc0834b82
+  metadata.gz: cc188984afc3d543f4350dbd750ccd57a470b664
+  data.tar.gz: 507c97cdb444d0936f05dafa79e467714bfbff8a
 SHA512:
-  metadata.gz: 8724eb33be119da8db638be2e3ff57ba3137377683a2e1954e79be8bcd626fe0465cda9debf66591a7f51c3b61986a3f3adf2055d1ea5afd96d1986632118d0a
-  data.tar.gz: 835216657cdd7b8c731966e33204cfdd0dcf9e15af913e47139fe2148bcecc587cc645f9a53fbdd3762cee35b7668bacafdfa7ee61ae01646f711af3ebf3268d
+  metadata.gz: 06db174531943f8749c9b911fed499f2058d6d9c939ac490922660a8c1eb6f94341100174945403712d0795810a7adebea073ee0f7ec1d116d48d2f31467ebab
+  data.tar.gz: 8ed6a07ae457053bc2777a94e190aa5a1720007ea9e991e0c1c79b008d62eb638ab04c4039d8ecfe1ad73804c6afdfc6dc2a1464ed6e59e1e1e829d47a511367

data/lib/sbconstants/cli.rb

@@ -2,15 +2,16 @@ require 'set'
 
 module SBConstants
   class CLI
-    attr_accessor :options, :constants, :sections
+    attr_accessor :options, :constants, :sections, :storyboards
 
     def self.run argv
       new(Options.parse(argv)).run
     end
 
     def initialize options
-      self.options   = options
-      self.constants = Hash.new { |h,k| h[k] = Set.new }
+      self.options     = options
+      self.constants   = Hash.new { |h,k| h[k] = Set.new }
+      self.storyboards = Array.new
     end
 
     def run
@@ -65,14 +66,21 @@ To resolve the issue remove the ambiguity in naming - search your storyboards fo
     #
     # A constant key can potentially exist in many files so locations is a collection
     def parse_storyboards
-      Dir["#{options.source_dir}/**/*.storyboard"].each do |storyboard|
+      Dir["#{options.source_dir}/**/*.storyboard"].each_with_index do |storyboard, storyboard_index|
+
+        filename = File.basename(storyboard, '.storyboard')
+        storyboards << filename
+
+        constants[filename] << Location.new('storyboardNames', nil, storyboard, filename, storyboard_index + 1)
+
+
         File.readlines(storyboard).each_with_index do |line, index|
           options.queries.each do |query|
             next unless value = line[query.regex, 1]
             next if value.strip.empty?
             next unless value.start_with?(options.prefix) if options.prefix
 
-            constants[value] << Location.new(query.node, query.attribute, line.strip, File.basename(storyboard, '.storyboard'), index + 1)
+            constants[value] << Location.new(query.node, query.attribute, line.strip, filename, index + 1)
           end
         end
       end

data/lib/sbconstants/identifiers.yml

@@ -1,12 +1,12 @@
 ---
 segue: identifier
-tableViewCell: reuseIdentifier
-collectionViewCell: reuseIdentifier
 view: restorationIdentifier
+? - tableViewCell
+  - collectionViewCell
+: - reuseIdentifier
 ? - navigationController
   - viewController
   - tableViewController
   - collectionViewController
 : - storyboardIdentifier
   - restorationIdentifier
-  

data/lib/sbconstants/location.rb

@@ -1,7 +1,7 @@
 module SBConstants
   Location = Struct.new(:node, :attribute, :context, :file, :line) do
     def key_path
-      @key_path ||= "#{node}.#{attribute}"
+      @key_path ||= [node, attribute].compact.join('.')
     end
 
     def debug

data/lib/sbconstants/objc_constant_writer.rb

@@ -22,7 +22,7 @@ module SBConstants
     end
 
     def header
-      template_with_file "\n", File.open(template_file_path("objc_header.erb")).read
+      template_with_file "#import <Foundation/Foundation.h>\n\n", File.open(template_file_path("objc_header.erb")).read
     end
 
     def implementation
@@ -33,7 +33,7 @@ module SBConstants
     def template_with_file head, body
       @head = head
       @body = body
-      pre_processed_template = ERB.new(File.open("#{default_templates_dir}/objc_body.erb").read, nil, '<>').result(binding)
+      pre_processed_template = ERB.new(File.open(template_file_path("objc_body.erb")).read, nil, '<>').result(binding)
       ERB.new(pre_processed_template, nil, '<>').result(binding)
     end
     

data/lib/sbconstants/templates/objc_body.erb

@@ -6,7 +6,7 @@
 <%% present_constants(section).each do |constant_name, constant_value| %>
 <%% if options.verbose %>
 //
-<%% constants[constant].each do |location| %>
+<%% constants[constant_name].each do |location| %>
 //    info: <%%= location.debug %>
 // context: <%%= location.context %>
 //

data/lib/sbconstants/version.rb

@@ -1,3 +1,3 @@
 module SBConstants
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sbconstants
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Paul Samuels
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies: []
 description: Generate constants from storyboards in ObjC and Swift.
 email: