apotomo 1.2.2 → 1.2.3

data/.travis.yml

@@ -1,3 +1,12 @@
-rvm: 1.9.2
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx-18mode
+  - rbx-19mode
+  - ree
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
 notifications:
   irc: "irc.freenode.org#cells"

data/CHANGES.textile

@@ -1,3 +1,7 @@
+h2. 1.2.3
+
+* Maintenance release to make happy people happy.
+
 h2. 1.2.2
 
 * Derive @Apotomo::Widget@ from @Cell::Rails@ now to make it compatible with 3.8.

data/README.rdoc

@@ -44,7 +44,7 @@ Let's wrap that comments block in a widget.
 
 Go and generate a widget stub.
 
-  $ rails generate apotomo:widget CommentsWidget display write -e haml
+  $ rails generate apotomo:widget Comments display write -e haml
     create  app/cells/
     create  app/cells/comments_widget
     create  app/cells/comments_widget.rb
@@ -62,10 +62,10 @@ You now tell your controller about the new widget.
     include Apotomo::Rails::ControllerMethods
     
     has_widgets do |root|
-      root << widget('comments_widget', 'post-comments', :post => @post)
+      root << widget(:comments, :post => @post)
     end
 
-The widget is named <tt>post-comments</tt>. We pass the current post into the widget - the block is executed in controller instance context, that's were <tt>@post</tt> comes from. Handy, isn't it?
+This creates a widget instance called <tt>comments_widget</tt> from the class CommentsWidget.  We pass the current post into the widget - the block is executed in controller instance context, that's were <tt>@post</tt> comes from. Handy, isn't it?
 
 == Render the widget
 
@@ -77,7 +77,7 @@ Rendering usually happens in your controller view, <tt>views/posts/show.html.ham
     @post.body
   
   %p
-    = render_widget 'post-comments'
+    = render_widget :comments
 
 == Write the widget
 
@@ -148,7 +148,7 @@ Also, updating the page is in your hands. Where Apotomo provides handy helpers a
 
 Look, +replace+ basically generates
 
-  $("post-comments").replaceWith(<the rendered view>);
+  $("comments").replaceWith(<the rendered view>);
 
 If that's not what you want, do
 
@@ -166,11 +166,11 @@ Apotomo comes with its own test case and assertions to <b>build rock-solid web c
 
   class CommentsWidgetTest < Apotomo::TestCase
     has_widgets do |root|
-      root << widget(:comments_widget, 'me', :post => @pervert_post)
+      root << widget(:comments, :post => @pervert_post)
     end
     
     def test_render
-      render_widget 'me'
+      render_widget :comments
       assert_select "li#me"
       
       trigger :post, :comment => {:text => "Sex on the beach"}
@@ -202,4 +202,4 @@ If you wanna be cool, subscribe to our feed[http://feeds.feedburner.com/Apotomo]
 
 
 == License
-Copyright (c) 2007-2011 Nick Sutterer <apotonick@gmail.com> under the MIT License
+Copyright (c) 2007-2012 Nick Sutterer <apotonick@gmail.com> under the MIT License

data/lib/apotomo/test_case.rb

@@ -34,54 +34,52 @@ module Apotomo
     module TestMethods
       extend ActiveSupport::Concern
 
-      module InstanceMethods
-        include Cell::TestCase::CommonTestMethods
+      include Cell::TestCase::CommonTestMethods
+      
+      attr_reader :view_assigns
+      
+      def setup
+        super # defined in Cell::TestCase::CommonTestMethods.
         
-        attr_reader :view_assigns
-        
-        def setup
-          super # defined in Cell::TestCase::CommonTestMethods.
-          
-          @controller.instance_eval do
-            def controller_path
-              'barn'
-            end
+        @controller.instance_eval do
+          def controller_path
+            'barn'
           end
-          @controller.extend Apotomo::Rails::ControllerMethods
         end
-        
-        # Renders the widget +name+.
-        def render_widget(*args)
-          @view_assigns = extract_state_ivars_for(root[args.first]) do
-            @last_invoke = root.render_widget(*args)
-          end
-          
-          @last_invoke
+        @controller.extend Apotomo::Rails::ControllerMethods
+      end
+      
+      # Renders the widget +name+.
+      def render_widget(*args)
+        @view_assigns = extract_state_ivars_for(root[args.first]) do
+          @last_invoke = root.render_widget(*args)
         end
+        
+        @last_invoke
+      end
 
-        # Triggers an event of +type+. You have to pass the +source+ as second options.
-        #
-        # Example:
-        #
-        #   trigger :submit, :comments
-        def trigger(type, source, options={})
-          source = root.find_widget(source)
-          source.fire(type, options)
-          root.page_updates
-        end
+      # Triggers an event of +type+. You have to pass the +source+ as second options.
+      #
+      # Example:
+      #
+      #   trigger :submit, :comments
+      def trigger(type, source, options={})
+        source = root.find_widget(source)
+        source.fire(type, options)
+        root.page_updates
+      end
 
-        # Returns the widget tree from TestCase.has_widgets.
-        def root
-          blk = self.class.has_widgets_blocks or raise "Please setup a widget tree using has_widgets()"
-          @root ||= Apotomo::Widget.new(parent_controller, "root").tap do |root|
-             self.instance_exec(root, &blk)
-          end
-        end
-        
-        def parent_controller
-          @controller
+      # Returns the widget tree from TestCase.has_widgets.
+      def root
+        blk = self.class.has_widgets_blocks or raise "Please setup a widget tree using has_widgets()"
+        @root ||= Apotomo::Widget.new(parent_controller, "root").tap do |root|
+           self.instance_exec(root, &blk)
         end
       end
+      
+      def parent_controller
+        @controller
+      end
 
       module ClassMethods
         def has_widgets_blocks

data/lib/apotomo/version.rb

@@ -1,3 +1,3 @@
 module Apotomo
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/test/widget_test.rb

@@ -110,7 +110,11 @@ class WidgetTest < ActiveSupport::TestCase
     end
     
     should "respond to .view_paths" do
-      assert_equal ActionView::PathSet.new(Apotomo::Widget::DEFAULT_VIEW_PATHS + ["test/widgets"]), Apotomo::Widget.view_paths
+      if Cells.rails3_2_or_more?
+        assert_equal ActionView::PathSet.new(Apotomo::Widget::DEFAULT_VIEW_PATHS + ["test/widgets"]).paths, Apotomo::Widget.view_paths.paths
+      else
+        assert_equal ActionView::PathSet.new(Apotomo::Widget::DEFAULT_VIEW_PATHS + ["test/widgets"]), Apotomo::Widget.view_paths
+      end
     end
     
     should "respond to .controller_path" do

metadata

@@ -1,142 +1,112 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: apotomo
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 2
-  version: 1.2.2
+version: !ruby/object:Gem::Version
+  version: 1.2.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-21 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cells
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &74978860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 6
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.6.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: onfire
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *74978860
+- !ruby/object:Gem::Dependency
+  name: onfire
+  requirement: &74978510 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hooks
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *74978510
+- !ruby/object:Gem::Dependency
+  name: hooks
+  requirement: &74978060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *74978060
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &74977250 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *74977250
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &74976840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: slim
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *74976840
+- !ruby/object:Gem::Dependency
+  name: slim
+  requirement: &74966910 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *74966910
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &74966580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: tzinfo
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *74966580
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: &74966340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-description: Web component framework for Rails providing widgets that trigger events and know when and how to update themselves with AJAX.
-email: 
+  prerelease: false
+  version_requirements: *74966340
+description: Web component framework for Rails providing widgets that trigger events
+  and know when and how to update themselves with AJAX.
+email:
 - apotonick@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGES.textile
@@ -226,37 +196,28 @@ files:
 - test/widgets/mouse/feed.html.erb
 - test/widgets/mouse/make_me_squeak.html.erb
 - test/widgets/mouse/snuggle.html.erb
-has_rdoc: true
 homepage: http://github.com/apotonick/apotomo
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Web components for Rails.
 test_files: []
-