method_struct 0.0.4 → 0.0.5

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .ruby-version
+bin

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+  - 1.8.7
+script: "bundle exec rspec"

data/README.md

@@ -1,6 +1,10 @@
 # MethodStruct
 
-Facilitates extracting large methods into objects - see Usage
+[![Build Status](https://travis-ci.org/basecrm/method_struct.png?branch=master)](https://travis-ci.org/basecrm/method_struct)
+
+Facilitates extracting large methods into objects - see Usage.
+For a more in-depth treatment of the refactoring see
+http://sourcemaking.com/refactoring/replace-method-with-method-object
 
 ## Installation
 
@@ -20,15 +24,18 @@ Or install it yourself as:
 
 Say you have this:
 
+```ruby
     class UsersController
       def create
         User.create(:email => params[:email], :name => params[:name])
         Mailer.registration_email(params[:email]).deliver
       end
     end
+```
 
 You can change it into this:
 
+```ruby
     class Registrator < MethodStruct.new(:email, :name)
       def call
         create_user!
@@ -52,20 +59,23 @@ You can change it into this:
         Registrator.call(:email => params[:email], :name => params[:name])
       end
     end
+```
 
 You can also specify a different method name like so:
 
-  class Registrator < MethodStruct.new(:email, :name, :method_name => :register)
-    def register
-      # ...
+```ruby
+    class Registrator < MethodStruct.new(:email, :name, :method_name => :register)
+      def register
+        # ...
+      end
     end
-  end
 
-  class UsersController
-    def create
-      Registrator.register(params[:email], params[:name])
+    class UsersController
+      def create
+        Registrator.register(params[:email], params[:name])
+      end
     end
-  end
+```
 
 One hopes the benefits will be more obvious for more complex methods
 

data/lib/method_struct/version.rb

@@ -1,3 +1,3 @@
 module MethodStruct
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/method_struct.rb

@@ -19,7 +19,7 @@ module MethodStruct
       end
 
       define_method(:initialize) do |*values|
-        if fields.size > 1 && values.first.is_a?(Hash)
+        if fields.size > 1 && values.size == 1 && values.first.is_a?(Hash)
           fields.each do |field|
             instance_variable_set("@#{field}", values.first[field])
           end

data/spec/method_struct_spec.rb

@@ -16,17 +16,21 @@ describe MethodStruct do
       end
     end
 
-    before { verifier.should_receive(:poke).with(argument1, argument2) }
+    before {}
 
     it "creates a class method which calls the declared instance method with the given context" do
+      verifier.should_receive(:poke).with(argument1, argument2)
       create_poker(verifier).call(argument1, argument2)
     end
 
     it "creates a hash version of the call method" do
+      verifier.should_receive(:poke).with(argument1, argument2)
       create_poker(verifier).call(:x => argument1, :y => argument2)
     end
 
     it "can change the name of the main method" do
+      verifier.should_receive(:poke).with(argument1, argument2)
+
       the_verifier = verifier
       poker = Class.new(MethodStruct.new(:x, :y, :method_name => :something)) do
         define_method(:something) do
@@ -36,5 +40,28 @@ describe MethodStruct do
 
       poker.something(argument1, argument2)
     end
+
+    context "when arguments are hashes" do
+      let(:argument1) { { :things => true } }
+      let(:argument2) { { :stuff => true } }
+
+      it "handles them correctly" do
+        verifier.should_receive(:poke).with(argument1, argument2)
+        create_poker(verifier).call(argument1, argument2)
+      end
+
+      it "allows the single argument to be a hash" do
+        verifier.should_receive(:poke).with(argument1)
+
+        the_verifier = verifier
+        poker = Class.new(MethodStruct.new(:x)) do
+          define_method(:call) do
+            the_verifier.poke(x)
+          end
+        end
+
+        poker.call(argument1)
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: method_struct
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - "Pawe\xC5\x82 Obrok"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-15 00:00:00 +02:00
+date: 2013-07-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md