objc-referee 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bcb63d18db2e93bca9a64df61564a0d3ba45d7f
-  data.tar.gz: 07ed9bd6dda0b647b751d803d583967bd761d14a
+  metadata.gz: ab33621de6d2c048a7941e38fc2829ef73f41ba2
+  data.tar.gz: 87c5d7583369eaa5c8ff4644025d737751e51f62
 SHA512:
-  metadata.gz: f291f795d14d164796afa6c372ec8ba42bbae833c74253946d007146485bc0cb812049c642a91a49330a939c008ea29f24284fff8a7253056cd3c733ee2b0509
-  data.tar.gz: ccda4f5cc16b3979a4ad5c29b1b1b17f1b93deabdff66d640a10f7228b914d3fefe572b192872faea2367308f1ba56d49301c83c976cdac9a29f2c2bc8ae4080
+  metadata.gz: af7c0a621f8d1eb67f329824f03bb3df95c9f2fa95060a9225702c1a61cfed8baa473eb1cace69d1efbc0022425883f2fdeb00d4044d602a7ba602f8e2d82423
+  data.tar.gz: f4abbde63f073771b68d3ca791c893504cc45d2b8326ac0a7e328f327feca811a7a43ba5529f8af0479d4c353385d70e58bf5a16502aafa5b8ecaedce081d802

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.rubocop.yml

@@ -4,6 +4,7 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   Exclude:
     - 'bin/*'
+    - 'spec/spec_helper.rb'  # autogenerated file
 
 # Give us... a little more room.
 Metrics/LineLength:

data/.travis.yml

@@ -2,11 +2,13 @@ sudo: false
 cache: bundler
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.0
   - 2.1
   - 2.2
+  - 2.3
 before_install: gem update --remote bundler
 install:
   - bundle install --retry=3
 script:
+  - bundle exec rspec
   - bundle exec rubocop

data/CHANGELOG.md

@@ -3,7 +3,14 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/) and this file attempts to follow the guidelines provided by [Keep a CHANGELOG](http://keepachangelog.com/).
 
 ## [Unreleased]
-Forthcoming.
+TODO
+
+## [0.3.0] - 2016-03-08
+### Added
+- View controllers are now returned as the type they were defined to be in Interface Builder [(#2)](https://github.com/Dynamit/referee/issues/2).
+  - This removes the `as! FooViewController`-type code that was required in the past.
+  - As an update, to remove Xcode build warnings, you'll want to remove these forced casts from your own code. Regardless, existing code should still compile without an _error_, at least.
+- Test suite to reduce regression errors. Travis-CI is running these against `master`.
 
 ## [0.2.4] - 2016-01-15
 ### Added
@@ -34,7 +41,8 @@ Forthcoming.
 ## [0.1.1] - 2015-09-02
 Initial public release.
 
-[unreleased]: https://github.com/dynamit/referee/compare/v0.2.4...HEAD
+[unreleased]: https://github.com/dynamit/referee/compare/v0.3.0...HEAD
+[0.3.0]: https://github.com/Dynamit/referee/tree/v0.3.0
 [0.2.4]: https://github.com/Dynamit/referee/tree/v0.2.4
 [0.2.3]: https://github.com/Dynamit/referee/tree/v0.2.3
 [0.2.2]: https://github.com/Dynamit/referee/tree/v0.2.2

data/Gemfile.lock

@@ -20,6 +20,7 @@ GEM
       parser (~> 2.2)
     coderay (1.1.0)
     colored (1.2)
+    diff-lcs (1.2.5)
     i18n (0.7.0)
     json (1.8.3)
     method_source (0.8.2)
@@ -37,6 +38,15 @@ GEM
       slop (~> 3.4)
     rainbow (2.0.0)
     rake (10.4.2)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     rubocop (0.33.0)
       astrolabe (~> 1.3)
       parser (>= 2.2.2.5, < 3.0)
@@ -61,6 +71,9 @@ DEPENDENCIES
   objc-referee!
   pry (~> 0.10.1)
   rake (~> 10.0)
+  rspec-core (~> 3.4)
+  rspec-expectations (~> 3.4)
+  rspec-mocks (~> 3.4)
   rubocop (~> 0.33.0)
   rubygems-tasks (~> 0.2.4)
 

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Dynamit, LLC
+Copyright (c) 2015-2016 Dynamit Technologies, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -20,14 +20,14 @@ Without `referee`, you can either maintain your own constants file in parallel w
 
 ```objc
 UIStoryboard *mainStoryboard = [UIStoryboard storyboardWithName:@"Main" bundle:[NSBundle mainBundle]];
-UIViewController *someViewController = [mainStoryboard instantiateViewControllerWithIdentifier:@"Some View Controller"];
+SomeViewController *someViewController = [mainStoryboard instantiateViewControllerWithIdentifier:@"Some View Controller"];
 [someViewController performSegue:@"Some Segue"];
 ```
 
 With `referee`, you can replace this with references to a few automatically generated classes:
 
 ```objc
-UIViewController *someViewController = TSTResources.viewControllers.SomeViewController;
+SomeViewController *someViewController = TSTResources.viewControllers.SomeViewController;
 [someViewController performSegue:TSTResources.segues.SomeSegue];
 ```
 

data/lib/referee/project.rb

@@ -13,6 +13,20 @@ module Referee
                               avPlayerViewController
                               tabBarController)
 
+    DEFAULT_VIEW_CONTROLLER_TYPES = %w(
+      UIViewController
+      UITableViewController
+      UINavigationController
+      GLKViewController
+      UIPageViewController
+      UICollectionViewController
+      UISplitViewController
+      AVPlayerViewController
+      UITabBarController
+    )
+
+    VIEW_CONTROLLER_TYPE_MAP = Hash[VIEW_CONTROLLER_TAGS.zip(DEFAULT_VIEW_CONTROLLER_TYPES)]
+
     attr_accessor :config, :resources
 
     # Instantiate a new `Project` instance given a `Configuration`.
@@ -79,7 +93,14 @@ module Referee
     def view_controllers(xml)
       selector = VIEW_CONTROLLER_TAGS.join(',')
       controllers = xml.css(selector)
-      controllers.map { |n| n['storyboardIdentifier'] }
+      controllers_list = controllers.map do |n|
+        tag_name = n.name
+        identifier = n['storyboardIdentifier']
+        klass = n['customClass'] || VIEW_CONTROLLER_TYPE_MAP[tag_name]
+        { identifier: identifier, class: klass }
+      end
+      controllers_list.delete_if { |c| c[:identifier].nil? || c[:identifier].strip.empty? }
+      controllers_list
     end
 
     def segues(xml)

data/lib/referee/renderables/viewcontroller.rb

@@ -3,11 +3,12 @@ module Referee
   class ViewController < Renderable
     attr_accessor :name, :storyboard, :config
 
-    def initialize(name, storyboard, config)
+    def initialize(name, klass, storyboard, config)
       @name = name
+      @class = klass
       @storyboard = storyboard
-      @type = 'UIViewController *'
-      @swift_type = 'UIViewController'
+      @type = "#{@class} *"
+      @swift_type = @class
       @config = config
     end
 
@@ -17,15 +18,22 @@ module Referee
 
     def implementation
       bundle = bundle_accessor(@config.bundle_id)
-      body = "[[UIStoryboard storyboardWithName:@\"#{@storyboard}\" bundle:#{bundle}] " \
+      body = "(#{@type})[[UIStoryboard storyboardWithName:@\"#{@storyboard}\" bundle:#{bundle}] " \
              "instantiateViewControllerWithIdentifier:@\"#{@name}\"]"
       simple_method_implementation @name, body
     end
 
     def swift_implementation
       bundle = swift_bundle_accessor(@config.bundle_id)
+
+      if @swift_type == 'UIViewController'
+        cast = ''
+      else
+        cast = " as! #{@swift_type}"
+      end
+
       body = "UIStoryboard(name: \"#{@storyboard}\", bundle: #{bundle})." \
-             "instantiateViewControllerWithIdentifier(\"#{@name}\")"
+             "instantiateViewControllerWithIdentifier(\"#{@name}\")#{cast}"
       simple_swift_method @name, body
     end
   end

data/lib/referee/resourcegroup.rb

@@ -30,7 +30,11 @@ module Referee
     end
 
     def view_controllers
-      @view_controllers.map { |c| ViewController.new(c, storyboard_name, @config) }
+      @view_controllers.map do |c|
+        identifier = c[:identifier]
+        klass = c[:class]
+        ViewController.new(identifier, klass, storyboard_name, @config)
+      end
     end
 
     def segues

data/lib/referee/version.rb

@@ -1,4 +1,4 @@
 # Version information.
 module Referee
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'
 end

data/objc-referee.gemspec

@@ -27,6 +27,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~> 0.33.0'
   spec.add_development_dependency 'pry', '~> 0.10.1'
   spec.add_development_dependency 'rubygems-tasks', '~> 0.2.4'
+  spec.add_development_dependency 'rspec-core', '~> 3.4'
+  spec.add_development_dependency 'rspec-expectations', '~> 3.4'
+  spec.add_development_dependency 'rspec-mocks', '~> 3.4'
 
   spec.add_runtime_dependency 'xcodeproj', '~> 0.20.1'
   spec.add_runtime_dependency 'mustache', '~> 1.0', '>= 1.0.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: objc-referee
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Colin Drake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.4
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +186,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"