pro_motion_slide_menu 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 510c70c1657c6a65e56b2fd3e1fce176b1a30db1
-  data.tar.gz: 2e3eed2f86d6f9266b4ebd7cd60da0bf349133f1
+  metadata.gz: 7148e8f03e619e974f7b344d02dfa2bbae62d9d7
+  data.tar.gz: 88b16891c938401a49bf29e7b5b8e0b695263f59
 SHA512:
-  metadata.gz: 72a380ae3763a3d68ffd2bd6b9499df65d400e6407d46ab2f7bdcfaec1b01f1e3326bc95f9eff7a45cd574a9430c0b54ec4a4f1ef1cb4867c0f16f11634026de
-  data.tar.gz: 4c28ee7f343bf68d9f601fbfe52c582478b97333c3196889951f27e58c7fb8b5e245fc4bfec617245cc07d3dd63ec61bec171adeb8f12bfb9222b5482d89cd6d
+  metadata.gz: fa0c9db585aa8e05a8765be788c4473ef66b0811347636ad153c51e1377b2ca95decd4e5ce93fef5bebf3e0e0bb356e613db424e34e605cd9d0c0c5ec4b7a1f6
+  data.tar.gz: fb4785c9b5333bf437f01a84b967a16c60a0737eca75629adc7f4ddebb26116aec0f637c74b0594b4af722a0f9957be8b3502f0ccbd700821619d22d5408ab06

data/.travis.yml

@@ -1,6 +1,8 @@
 language: objective-c
 gemfile:
   - Gemfile
-before_script: bundle install
+before_script:
+- "bundle exec pod setup --silent"
+- "bundle exec rake pod:install -s"
 script: bundle exec rake spec
 bump: 2

data/Gemfile

@@ -1,7 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
+gem 'rake'
 gemspec
-gem 'bubble-wrap'
-gem 'motion-cocoapods'
-gem 'ProMotion', '>= 0.5.2'
-gem 'pro_motion_slide_menu', :path => '.'

data/Gemfile.lock

@@ -1,72 +1,54 @@
 PATH
   remote: .
   specs:
-    pro_motion_slide_menu (0.0.3)
-      ProMotion (~> 0.7.6)
+    pro_motion_slide_menu (0.0.4)
+      ProMotion (~> 1.0)
       bubble-wrap
       motion-cocoapods
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    ProMotion (0.7.6)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    ProMotion (1.0.4)
+    activesupport (3.2.15)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.5)
     bubble-wrap (1.3.0)
     claide (0.3.2)
-    cocoapods (0.20.2)
-      activesupport (~> 3.2.13)
+    cocoapods (0.26.2)
+      activesupport (~> 3.2)
       claide (~> 0.3.2)
-      cocoapods-core (= 0.20.2)
-      cocoapods-downloader (~> 0.1.1)
+      cocoapods-core (= 0.26.2)
+      cocoapods-downloader (~> 0.2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      faraday (~> 0.8.1)
-      json (~> 1.8.0)
-      octokit (~> 1.7)
-      open4 (~> 1.3.0)
-      rake (~> 10.0.0)
-      xcodeproj (~> 0.6.0)
-    cocoapods-core (0.20.2)
-      activesupport (~> 3.2.13)
-      rake (~> 10.0.0)
-    cocoapods-downloader (0.1.1)
+      json (~> 1.8)
+      open4 (~> 1.3)
+      xcodeproj (~> 0.13.0)
+    cocoapods-core (0.26.2)
+      activesupport (~> 3.0)
+      json (~> 1.8)
+      nap (~> 0.5)
+    cocoapods-downloader (0.2.0)
     colored (1.2)
     escape (0.0.4)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
-    hashie (2.0.5)
-    i18n (0.6.1)
-    json (1.8.0)
-    motion-cocoapods (1.3.3)
-      cocoapods (>= 0.17.0)
-    motion-stump (0.2.1)
-    multi_json (1.7.7)
-    multipart-post (1.2.0)
-    netrc (0.7.7)
-    octokit (1.24.0)
-      addressable (~> 2.2)
-      faraday (~> 0.8)
-      faraday_middleware (~> 0.9)
-      hashie (~> 2.0)
-      multi_json (~> 1.3)
-      netrc (~> 0.7.7)
+    i18n (0.6.5)
+    json (1.8.1)
+    motion-cocoapods (1.4.0)
+      cocoapods (>= 0.26.2)
+    motion-stump (0.3.0)
+    multi_json (1.8.2)
+    nap (0.5.1)
     open4 (1.3.0)
-    rake (10.0.4)
-    xcodeproj (0.6.0)
-      activesupport (~> 3.2.13)
+    rake (10.1.0)
+    xcodeproj (0.13.1)
+      activesupport (~> 3.0)
       colored (~> 1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  ProMotion (>= 0.5.2)
-  bubble-wrap
-  motion-cocoapods
   motion-stump
   pro_motion_slide_menu!
+  rake

data/README.md

@@ -1,5 +1,5 @@
 # ProMotion SlideMenu
-This gem provides an easier way to integrate a great open source toolkit, [RubyMotion](http://www.rubymotion.com), with another great Objective-C framework, [PKRevealController](https://github.com/pkluz/PKRevealController), allowing you to easily have a cool facebook or Path style slide navigation menu, complete with gestures.
+This gem provides an easier way to integrate a great open source toolkit, [RubyMotion](http://www.rubymotion.com), with another great Objective-C framework, [PKRevealController](https://github.com/pkluz/PKRevealController), allowing you to easily have a cool Facebook or Path style slide navigation menu, complete with gestures.
 
 ![Travis CI](https://secure.travis-ci.org/macfanatic/promotion_slide_menu.png?branch=master)
 
@@ -24,27 +24,21 @@ This depends on motion-cocoapods, BubbleWrap and ProMotion.
 
 ### Rakefile
 
-Currently there is a bug with [motion-cocoapods](https://github.com/HipByte/motion-cocoapods/issues/38) that doesn't allow us to automatically include an ObjC library automatically.  Because of this, you will need to edit your Rakefile as follows:
-
-```ruby
-app.pods do
-  pod 'PKRevealController'
-end
-```
+As of [motion-cocoapods](https://github.com/HipByte/motion-cocoapods/compare/1.3.6...1.3.7) v1.3.7, you no longer have to include a pods setup block in your project Rakefile, we can do that for you in the gem.
 
 ## Creating and Configuring a Slide Menu
 To create a slide menu in your application, you need to start in your AppDelegate:
 
 ```ruby
 class AppDelegate < ProMotion::AppDelegateParent
-  
+
   def on_load(app, options)
 
-    # Open the slide menu with your navigation view (initially hidden) and a content view (initially shown)
-    open_slide_menu NavigationScreen, MyGreatAppScreen.new(nav_bar: true)
+    # Open the slide menu with your content view (initially shown) and navigation view(s) (initially hidden)
+    open_slide_menu MyGreatAppScreen.new(nav_bar: true), left: NavigationScreen
 
     # You can get to the instance of the slide menu at any time if you need to
-    slide_menu.menu_controller.class.name
+    slide_menu.controller(:left).class.name
     # => NavigationScreen
 
     # SlideMenuScreen is just an enhanced subclass of PKRevealController, so you can do all sorts of things with it
@@ -63,13 +57,13 @@ To make the slide menu present the menu from anywhere in your app:
 ```ruby
 
 # Show the menu
-App.delegate.slide_menu.show_menu
+App.delegate.slide_menu.show(:left)
 
 # Equivalent to
-App.delegate.slide_menu.showViewController App.delegate.slide_menu.menu_controller, animated: true, completion: ->(c) { true }
+App.delegate.slide_menu.showViewController App.delegate.slide_menu.left_controller, animated: true, completion: ->(c) { true }
 
 # Hide the menu
-App.delegate.slide_menu.hide_menu
+App.delegate.slide_menu.hide
 
 # Equivalent to
 App.delegate.slide_menu.showViewController App.delegate.slide_menu.content_controller, animated: true, completion: ->(c) { true }
@@ -94,7 +88,7 @@ class NavigationScreen < ProMotion::TableScreen
   end
 
   def swap_content_controller(screen_class)
-    App.delegate.slide_menu.content_controller = screen_class
+    App.delegate.slide_menu.controller(content: screen_class)
   end
 
 end
@@ -104,7 +98,11 @@ end
 By default, `PKRevealController` supports showing the slide menu via a gesture recognizer.  To disable this feature, look at the documentation or use the following:
 
 ```ruby
-App.delegate.slide_menu.recognizesPanningOnFrontView = false
+# Disable the gesture recongizer
+App.delegate.slide_menu.removePanGestureRecognizerFromFrontView
+
+# Re-enable the gesture recognizer (enabled by default)
+App.delegate.slide_menu.addPanGestureRecognizerToFrontView
 ```
 
 ## Creating a UIBarButtonItem to show the menu
@@ -123,14 +121,14 @@ class MyScreen < ProMotion::Screen
 
      # Create a Bar button item containing that button
      # When tapping the button, show the menu (uses Sugarcube syntax)
-    @left_item = UIBarButtonItem.alloc.initWithCustomView(swipe_btn)    
+    @left_item = UIBarButtonItem.alloc.initWithCustomView(swipe_btn)
     swipe_btn.on(:touch.uicontrolevent) do
-      App.delegate.slide_menu.show_menu
+      App.delegate.slide_menu.show(:left)
     end
 
     # Assign the button item to the navigation item for it to appear in the top left
     self.navigationItem.leftBarButtonItem = @left_item
-    
+
   end
 end
 ```

data/Rakefile

@@ -9,8 +9,4 @@ Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
   app.name = 'ProMotionSlideMenu'
   app.delegate_class = 'TestAppDelegate'
-
-  app.pods do
-    pod 'PKRevealController'
-  end
 end

data/lib/pro_motion_slide_menu/app_delegate.rb

@@ -9,8 +9,8 @@ module ProMotionSlideMenu
       !slide_menu.nil?
     end
 
-    def open_slide_menu(menu, content, options={})
-      self.slide_menu = SlideMenuScreen.new(menu, content, options)
+    def open_slide_menu(content, options={})
+      self.slide_menu = SlideMenuScreen.new(content, options)
       open_root_screen slide_menu
       slide_menu
     end

data/lib/pro_motion_slide_menu/slide_menu_screen.rb

@@ -7,37 +7,58 @@ module ProMotionSlideMenu
     # SlideMenuScreen
     #
     # This is added as the root view controller when using the `open_slide_menu` method in your application delegate.
-    # 
-    # Several properties are defined to get the underlying PKRevealController instance for additional configuration, the 
+    #
+    # Several properties are defined to get the underlying PKRevealController instance for additional configuration, the
     # screen shown as the hidden menu, and the screen shown as the content controller.
     #
 
-    def self.new(menu, content, options={})
+    def self.new(content, options={})
       screen = self.revealControllerWithFrontViewController(nil, leftViewController: nil, options: nil)
-      screen.on_create(options) if screen.respond_to?(:on_create)
-      screen.menu_controller = menu unless menu.nil?
       screen.content_controller = content unless content.nil?
+      screen.left_controller = options[:left] if options[:left]
+      screen.right_controller = options[:right] if options[:right]
+      screen_options = options.reject { |k,v| [:left, :right].include? k }
+      screen.on_create(screen_options) if screen.respond_to?(:on_create)
       screen
     end
 
-    def show_menu
-      self.showViewController menu_controller, animated: true, completion: default_completion_block
+    def show(side)
+      self.show_left if side == :left
+      self.show_right if side == :right
+    end
+
+    def show_left
+      self.showViewController left_controller, animated: true, completion: default_completion_block
+    end
+
+    def show_right
+      self.showViewController right_controller, animated: true, completion: default_completion_block
     end
 
-    def hide_menu
+    def hide
       self.showViewController content_controller, animated: true, completion: default_completion_block
     end
 
-    def menu_controller=(c)
+    def left_controller=(c)
       controller = prepare_controller_for_pm(c)
       controller = controller.navigationController || controller
       self.setLeftViewController controller, focusAfterChange: true, completion: default_completion_block
     end
 
-    def menu_controller
+    def left_controller
       self.leftViewController
     end
 
+    def right_controller=(c)
+      controller = prepare_controller_for_pm(c)
+      controller = controller.navigationController || controller
+      self.setRightViewController controller, focusAfterChange: true, completion: default_completion_block
+    end
+
+    def right_controller
+      self.rightViewController
+    end
+
     def content_controller=(c)
       controller = prepare_controller_for_pm(c)
       controller = controller.navigationController || controller
@@ -48,6 +69,19 @@ module ProMotionSlideMenu
       self.frontViewController
     end
 
+    def controller=(side={})
+      self.left_controller = side[:left] if side[:left]
+      self.right_controller = side[:right] if side[:right]
+      self.content_controller = side[:content] if side[:content]
+    end
+
+    alias_method :controllers=, :controller=
+
+    def controller(side)
+      self.left_controller if side == :left
+      self.right_controller if side == :right
+      self.content_controller if side == :content
+    end
 
     protected
 

data/lib/pro_motion_slide_menu/version.rb

@@ -1,3 +1,3 @@
 module ProMotionSlideMenu
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

data/lib/pro_motion_slide_menu.rb

@@ -19,8 +19,8 @@ Motion::Project::App.setup do |app|
   # THIS WON'T WORK until the following issue is resolved with motion-cocoapods
   # https://github.com/HipByte/motion-cocoapods/issues/38
   #
-  # app.pods do
-    # pod 'PKRevealController'
-  # end
+  app.pods do
+    pod 'PKRevealController'
+  end
 
 end

data/pro_motion_slide_menu.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.authors       = ["Matt Brewer"]
   s.email         = 'matt.brewer@me.com'
 
-  s.summary       = "Provides a facebook/Path style slide menu on the left for ProMotion RubyMotion apps."
-  s.description   = "Provides a facebook/Path style slide menu on the left for ProMotion RubyMotion apps."
+  s.summary       = "Provides a facebook/Path style slide menu for ProMotion RubyMotion apps."
+  s.description   = "Provides a facebook/Path style slide menu for ProMotion RubyMotion apps."
 
   s.homepage      = "https://github.com/macfanatic/pro_motion_slide_menu"
   s.files         = `git ls-files`.split($\)

data/spec/app_delegate_spec.rb

@@ -17,8 +17,8 @@ describe ProMotionSlideMenu::AppDelegate do
   end
 
   it "#open_slide_menu should return a SlideMenuScreen" do
-    @delegate.open_slide_menu(nil, nil).should.be.instance_of ProMotionSlideMenu::SlideMenuScreen
-  end 
+    @delegate.open_slide_menu(nil, left: nil).should.be.instance_of ProMotionSlideMenu::SlideMenuScreen
+  end
 
   it "should have a SlideMenuScreen as the rootViewController" do
     @delegate.window.rootViewController.should.be.instance_of ProMotionSlideMenu::SlideMenuScreen

data/spec/helpers/right_nav_screen.rb

@@ -0,0 +1,10 @@
+class RightNavScreen < ProMotion::TableScreen
+  def table_data
+    [{
+      title: nil,
+      cells: [{
+        title: 'OVERWRITE THIS METHOD'
+      }]
+    }]
+  end
+end

data/spec/slide_menu_screen_spec.rb

@@ -2,55 +2,63 @@ describe ProMotionSlideMenu::SlideMenuScreen do
 
   before do
     @delegate = App.delegate
-    @menu = LeftNavScreen.new
+    @left = LeftNavScreen.new
+    @right = RightNavScreen.new
     @content = BlankScreen.new
   end
 
   it "should return an instance of SlideMenuScreen" do
-    screen = ProMotionSlideMenu::SlideMenuScreen.new nil, nil
+    screen = ProMotionSlideMenu::SlideMenuScreen.new nil, left: nil
     screen.should.be.instance_of ProMotionSlideMenu::SlideMenuScreen
   end
 
   it "should store menu & content controllers" do
-    screen = ProMotionSlideMenu::SlideMenuScreen.new @menu, @content
-    screen.menu_controller.should == @menu
+    screen = ProMotionSlideMenu::SlideMenuScreen.new @content, left: @left
+    screen.left_controller.should == @left
     screen.content_controller.should == @content
   end
 
   it "should allow you to pass class instances" do
-    screen = ProMotionSlideMenu::SlideMenuScreen.new LeftNavScreen, BlankScreen
-    screen.menu_controller.should.be.instance_of LeftNavScreen
+    screen = ProMotionSlideMenu::SlideMenuScreen.new BlankScreen, left: LeftNavScreen
+    screen.left_controller.should.be.instance_of LeftNavScreen
     screen.content_controller.should.be.instance_of BlankScreen
   end
 
   it "should present the menu controller when requested" do
-    screen = ProMotionSlideMenu::SlideMenuScreen.new @menu, @content
-    screen.show_menu
-    wait(0.5) { screen.focusedController.should == @menu }
+    screen = ProMotionSlideMenu::SlideMenuScreen.new @content, left: @left
+    screen.show(:left)
+    wait(0.5) { screen.focusedController.should == @left }
   end
 
   it "should present the content controller when requested" do
-    screen = ProMotionSlideMenu::SlideMenuScreen.new @menu, @content
-    screen.hide_menu
+    screen = ProMotionSlideMenu::SlideMenuScreen.new @content, left: @left
+    screen.hide
     wait(0.5) { screen.focusedController.should == @content }
   end
 
   it "should let me wrap the content controller in a UINavigationController" do
     content_controller = BlankScreen.new(nav_bar: true)
-    screen = ProMotionSlideMenu::SlideMenuScreen.new @menu, content_controller
+    screen = ProMotionSlideMenu::SlideMenuScreen.new content_controller, left: @left
     screen.content_controller.should.be.instance_of ProMotion::NavigationController
   end
 
   it "should let me set the title on the content controller during creation" do
     content_controller = BlankScreen.new(title: 'My Title')
-    screen = ProMotionSlideMenu::SlideMenuScreen.new @menu, content_controller
+    screen = ProMotionSlideMenu::SlideMenuScreen.new content_controller, left: @left
     screen.content_controller.title.should == 'My Title'
   end
 
   it "should accept a plain UIViewController" do
-    screen = ProMotionSlideMenu::SlideMenuScreen.new nil, nil
-    should.not.raise(NoMethodError) { screen.menu_controller = UIViewController }
-    screen.menu_controller.should.be.instance_of UIViewController
+    screen = ProMotionSlideMenu::SlideMenuScreen.new nil, left: nil
+    should.not.raise(NoMethodError) { screen.left_controller = UIViewController }
+    screen.left_controller.should.be.instance_of UIViewController
+  end
+
+  it "should allow you to set both a right and left menu controller" do
+    screen = ProMotionSlideMenu::SlideMenuScreen.new @content, left: @left, right: @right
+    screen.left_controller.should == @left
+    screen.right_controller.should == @right
+    screen.content_controller.should == @content
   end
 
 end

data/vendor/Podfile.lock

@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   PKRevealController: 631e6a3db833a0c660203c2dba0963109549ec8a
 
-COCOAPODS: 0.20.2
+COCOAPODS: 0.26.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pro_motion_slide_menu
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Matt Brewer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -66,8 +66,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Provides a facebook/Path style slide menu on the left for ProMotion RubyMotion
-  apps.
+description: Provides a facebook/Path style slide menu for ProMotion RubyMotion apps.
 email: matt.brewer@me.com
 executables: []
 extensions: []
@@ -88,6 +87,7 @@ files:
 - spec/app_delegate_spec.rb
 - spec/helpers/blank_screen.rb
 - spec/helpers/left_nav_screen.rb
+- spec/helpers/right_nav_screen.rb
 - spec/slide_menu_screen_spec.rb
 - vendor/Podfile.lock
 homepage: https://github.com/macfanatic/pro_motion_slide_menu
@@ -112,10 +112,10 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Provides a facebook/Path style slide menu on the left for ProMotion RubyMotion
-  apps.
+summary: Provides a facebook/Path style slide menu for ProMotion RubyMotion apps.
 test_files:
 - spec/app_delegate_spec.rb
 - spec/helpers/blank_screen.rb
 - spec/helpers/left_nav_screen.rb
+- spec/helpers/right_nav_screen.rb
 - spec/slide_menu_screen_spec.rb