ovaltine 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  data.tar.gz: f76c243272bd421a5635d495d6796d4820688d624d322d7c2a3994e920c65d3b3ddea40f08fe6fcec1fe66973c963c1ca830cf6a1f5c91a64192c56d461f6442
-  metadata.gz: da7d8f1f5a64d059b5b62bc76847df9d3ff7c595c2df30147b9747aacaed3e4b60391f61c0b0b72bdf8f07688dc00ef8e9b761bcde085b898409eedb506daac1
-SHA1: 
-  data.tar.gz: 88b8b643bcc95048a2e41e9e970bbe10d68311be
-  metadata.gz: 96b9c29b9c0754d1065ddc765524a428a409978a
+---
+SHA1:
+  metadata.gz: 08745928ba920c56d5d97b0f58b645f28e98f041
+  data.tar.gz: dfbaa37a469700422e0ef8f23940fb5c8b6b414c
+SHA512:
+  metadata.gz: 6a345d0eaabb0e82a2a17e4a3ac003e9a080ade5ec410f6dacbc85b99868081b3b0c46a404bf30a2448cb01bb97508390b6d6fa69a4346af5164a265229046bc
+  data.tar.gz: b3665f740b6fa31b62b0aa14af824158d9d6c3234b975459bf05edd08f2d997540ac078fc453cc55dd82bbe00e6bff1cf64ef3d09cee75d33c53652edb30868c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.0.5
+
+- Cache identifiers for navigation controllers
+- Hotfix for writing duplicate identifiers
+
 # 1.0.4
 
 - Hotfix for failed error handling in Ruby 1.8.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ovaltine (1.0.3)
+    ovaltine (1.0.4)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -2,7 +2,7 @@
 
 The chocolatey treat which makes your code clean! Yum!
 
-`Ovaltine` scans your `storyboard` files and generates constant files for view controller, segue, and reuse identifiers. For instance, if you have a storyboard called `Main` and a view controller with the Storyboard ID `authenticationViewController`, then you can instantiate that controller with something like `[ABCMainStoryboard instantiateAuthenticationViewController]`. No mistyping, plenty of chocolately goodness.
+`Ovaltine` scans your `storyboard` files and generates constant files for view controller, segue, and reuse identifiers. For instance, if you have a storyboard called `Main` and a view controller with the Storyboard ID `authenticationViewController`, then you can instantiate that controller with something like `[ABCMainStoryboard instantiateAuthenticationViewController]`. No mistyping, plenty of chocolatey goodness.
 
 ## Installation
 
@@ -13,7 +13,7 @@ gem install ovaltine
 ## Example Usage
 
 ```
-ovaltine --prefix ABC --auto-replace --auto-add --project path/to/project.xcodeproj path/to/project/files
+ovaltine --prefix ABC --auto-replace --auto-add path/to/project/files
 ```
 
 Run from the command line or as a build step (if you are brave!) [Here](https://gist.github.com/kattrali/bbe9e2464d02a8ca4cb1) are some example files generated using `ovaltine`.
@@ -23,3 +23,7 @@ Run from the command line or as a build step (if you are brave!) [Here](https://
 ```
 ovaltine --help
 ```
+
+## Development
+
+`Ovaltine` is tested using [bacon](https://github.com/chneukirchen/bacon). After running `bundle install`, the tests can be run using the command `rake spec`.

data/features/fixtures/Sample/Sample/Base.lproj/Main.storyboard

@@ -101,7 +101,7 @@
         <!--Navigation Controller-->
         <scene sceneID="i23-07-0sf">
             <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="Rge-Ae-WFm" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="navigationViewController" automaticallyAdjustsScrollViewInsets="NO" id="Rge-Ae-WFm" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="gRu-BS-tP3">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>

data/lib/ovaltine/storyboard.rb

@@ -35,15 +35,15 @@ module Ovaltine
       case node.name
       when 'segue'
         if identifier = node.attributes["identifier"]
-          segue_identifiers << identifier
+          segue_identifiers << identifier unless segue_identifiers.include?(identifier)
         end
-      when /viewcontroller/i
+      when /viewcontroller/i, 'navigationController'
         if identifier = node.attributes["storyboardIdentifier"]
-          view_controller_identifiers << identifier
+          view_controller_identifiers << identifier unless view_controller_identifiers.include?(identifier)
         end
       when /cell/i
         if identifier = node.attributes["reuseIdentifier"]
-          cell_reuse_identifiers << identifier
+          cell_reuse_identifiers << identifier unless cell_reuse_identifiers.include?(identifier)
         end
       end
     end

data/lib/ovaltine/version.rb

@@ -1,3 +1,3 @@
 module Ovaltine
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/specs/storyboard_spec.rb

@@ -22,6 +22,10 @@ describe 'Storyboard' do
     @storyboard.view_controller_identifiers.should.include "listViewController"
   end
 
+  it 'caches identifiers for navigation view controllers' do
+    @storyboard.view_controller_identifiers.should.include "navigationViewController"
+  end
+
   it 'caches identifiers for named segues' do
     @storyboard.segue_identifiers.should.include "starterSegueIdentifier"
   end

metadata

@@ -1,56 +1,65 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ovaltine
-version: !ruby/object:Gem::Version 
-  version: 1.0.4
+version: !ruby/object:Gem::Version
+  version: 1.0.5
 platform: ruby
-authors: 
+authors:
 - Delisa Mason
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-08-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-09-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "10.0"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bacon
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: "\n  Constant generator for identifiers in Cocoa app storyboards\n  "
-email: 
+email:
 - iskanamagus@gmail.com
-executables: 
+executables:
 - ovaltine
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -94,33 +103,30 @@ files:
 - vendor/json_pure/generator.rb
 - vendor/json_pure/parser.rb
 homepage: https://github.com/kattrali/ovaltine
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Cocoa app constant generator
-test_files: 
+test_files:
 - features/fixtures/Sample/Sample.xcodeproj/project.pbxproj
 - features/fixtures/Sample/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 - features/fixtures/Sample/Sample/Base.lproj/Main.storyboard