restafari 0.5 → 0.6

data/.gemspec

@@ -24,4 +24,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
 
-end
+end

data/Gemfile

@@ -4,8 +4,8 @@ source "http://rubygems.org"
 
 
 gem 'faraday'
-
 group :test do
+
   gem 'rake'
   gem 'rspec'
   gem 'webmock'

data/lib/restafari/action.rb

@@ -9,7 +9,10 @@ module Restafari
 
     module ClassMethods
       def action(name, *args)
+
         case args.length
+          when 0
+            path = "/#{name.to_s}"
           when 1
             if args[0].is_a? String
               path = args[0]
@@ -24,15 +27,24 @@ module Restafari
 
         default_params ||= {}
 
-        define_singleton_method(name) { |params={}|
-          execute!(path, default_params.merge(params))
-        }
+        define_singleton_method(name) do |params={}|
+          execute!(path, default_params.merge(params)) do |method, url, path, params|
+            send_using_faraday(method, url, path, params)
+          end
+        end
+
+        define_singleton_method("#{name}_url") do |params={}|
+          Restafari.config.run_before_request_hook(default_params.merge(params))
+          conn = Faraday.new(url: Restafari.config.url, params: params)
+          conn.build_url(path)
+        end
+
       end
 
       private
       def execute!(path, params)
         conn = Faraday.new(url: Restafari.config.url)
-        Restafari.config.run_before_request_hook(conn, params)
+        Restafari.config.run_before_request_hook(params)
         result = conn.send(Restafari.config.http_method, path, params)
         Restafari.config.run_after_response_hook(result)
         Restafari::Response.new(result)

data/lib/restafari/version.rb

@@ -1,3 +1,3 @@
 module Restafari
-  VERSION = 0.5
+  VERSION = 0.6
 end

data/spec/restafari/action_spec.rb

@@ -7,7 +7,7 @@ describe Restafari::Action do
       action :some_method, { b: 1 }
     end
 
-    SomeAction.should_receive(:execute!).with(kind_of(String), { b: 1 }).once
+    SomeAction.should_receive(:execute!).with("/some_method", { b: 1 }).once
     SomeAction.some_method()
   end
 
@@ -27,7 +27,7 @@ describe Restafari::Action do
       action :some_method
     end
 
-    Restafari.config.before_request do |conn, params|
+    Restafari.config.before_request do |params|
       params[:test] = true
     end
 
@@ -51,4 +51,12 @@ describe Restafari::Action do
     SomeAction.some_method()
   end
 
+  it "should allow accessing the action url" do
+    class UrlTest
+      include Restafari::Action
+      action :url_method
+    end
+    UrlTest.url_method_url(rt:2).to_s.should eq "http://www.example.com/url_method?rt=2"
+  end
+
 end

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ end
 
 Restafari.config.base_url = "www.example.com"
 WebMock::stub_request(:post, "http://#{Restafari.config.base_url}/").to_return(:status => 200, :body => "{}", :headers => {})
-
+WebMock::stub_request(:post, "http://#{Restafari.config.base_url}/some_method").to_return(:status => 200, :body => "{}", :headers => {})
 unless defined?(RM_HOME)
   # this is here to allow teamcity to run with spork
   RM_HOME=File.expand_path("~/BuildAgent/plugins/rake-runner")

metadata

@@ -1,89 +1,115 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: restafari
-version: !ruby/object:Gem::Version
-  version: '0.5'
+version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: 
+  segments: 
+  - 0
+  - 6
+  version: "0.6"
 platform: ruby
-authors:
+authors: 
 - Danni Friedland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-15 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: faraday
-  requirement: &70155096119940 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70155096119940
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: webmock
-  requirement: &70155096119380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70155096119380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: spork
-  requirement: &70155096118760 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70155096118760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rack-test
-  requirement: &70155096118020 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70155096118020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70155096117260 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70155096117260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70155096116560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70155096116560
+  version_requirements: *id006
 description: Helper class to work with the restful apis
-email:
+email: 
 - - dannifriedland@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gemspec
 - .gitignore
 - Gemfile
@@ -100,26 +126,36 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/TheGiftsProject/restafari
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: A DSL for consuming RESTful apis
 test_files: []
+