musashi 0.0.1.b6 → 0.0.1

data/README.rdoc

@@ -56,7 +56,7 @@ Musashi is a RestClient that follows relations or links.
 
   require 'musashi'
   class Customer
-    include Musashi::Retriever
+    include Musashi
     include Musashi::Resource::JSON
     attr_accessor :id
     endpoint = '"http://foo.com/customers/#{id}"'

data/Rakefile

@@ -11,11 +11,20 @@ RSpec::Core::RakeTask.new(:spec)
 
 desc 'Run the gem build'
 task :build do
-  system 'gem build musashi.gemspec'
+  system "mkdir -p build && gem build musashi.gemspec && mv musashi-#{Musashi::VERSION}.gem build/."
 end
- 
-desc 'Run the gem push'
-task :release => [:spec, :build] do
+
+desc "Create tag v#{Musashi::VERSION} and build and push musashi-#{Musashi::VERSION}.gem to Rubygems"
+task :release => :build do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  system "git commit --allow-empty -a -m 'Release #{Musashi::VERSION}'"
+  system "git tag v#{Musashi::VERSION}"
+  system "git push origin master"
+  system "git push origin v#{Musashi::VERSION}"
+  system "gem push build/musashi-#{Musashi::VERSION}.gem"
   system "gem push musashi-#{Musashi::VERSION}.gem"
 end
 

data/lib/musashi.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+require 'active_support/core_ext/object/to_query'
 require 'active_support/core_ext/integer'
 require 'active_support/core_ext/string'
 require 'active_support/core_ext/hash'
@@ -11,6 +12,16 @@ require 'faraday/response/raise_http_4xx'
 require 'faraday/response/raise_http_5xx'
 require 'musashi/version'
 require 'musashi/connection'
+require 'musashi/publisher'
 require 'musashi/retriever'
 require 'musashi/resource'
 
+module Musashi
+  include Publisher
+  include Retriever
+end
+
+class Musashi::Resource
+  include ::Musashi
+end
+

data/lib/musashi/connection.rb

@@ -1,8 +1,20 @@
 # -*- encoding: utf-8 -*-
 module Musashi::Connection
 
-  attr_accessor :endpoint
-  attr_accessor_with_default :format, :json
+  attr_writer :endpoint
+  def endpoint
+    raise 'Undefined endpoint' if @endpoint.nil?
+    @endpoint
+  end
+
+  attr_writer :format
+  def format
+    @format ||= :json
+  end
+
+  def accept
+    @accept ||= "application/#{format.to_s}"
+  end
 
   def options
     return @options if @options
@@ -22,7 +34,7 @@ module Musashi::Connection
     builder.adapter :net_http
     @options = {
       :headers => {
-        'Accept' => "application/#{format}",
+        'Accept'     => accept,
         'User-Agent' => "Musashi Gem #{::Musashi::VERSION}"
       },
       :url => endpoint,

data/lib/musashi/publisher.rb

@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+module Musashi::Publisher
+
+  def data
+    @data ||= {}
+  end
+
+  def method_missing(sym,*args,&block)
+    super if block_given?
+    match = /(?<field>.+)=$/.match(sym.to_s)
+    super if match.nil? or match.size != 2
+    field = match[:field] 
+    attrs[field] = data[field] = args.first
+  end
+
+  def post(headers={})
+    marshall = ::Musashi::Publisher.marshalls[format] || WWWFormUrlencoded
+    payload, content_type = marshall.marshall(data)
+    headers = {} if headers.nil?
+    headers['Content-Type'] = content_type
+    connection.post(connection.path_prefix, payload, headers)
+  end
+
+  def self.marshalls
+    @@marashalls ||= {}
+  end
+
+  def self.marshall(format,class_or_module)
+    marshalls[format] = class_or_module
+  end
+
+  module WWWFormUrlencoded
+    def self.marshall(data)
+      [data.to_query, 'www-form-urlencoded']
+    end
+  end
+ 
+end
+

data/lib/musashi/resource.rb

@@ -49,7 +49,6 @@ class Musashi::Resource
 
   end
 
-  include ::Musashi::Retriever
   def initialize(url,options={})
     raise ArgumentError.new('Undefined url') if url.nil? or url.empty?
     resource_type = Format.formats[ options[:format] || :json ]

data/lib/musashi/retriever.rb

@@ -4,17 +4,12 @@ module Musashi::Retriever
   module Base
     include ::Musashi::Connection
 
-    attr_writer :path
-    def path
-      @path ||= connection.path_prefix
-    end
-
     def retrieved?
       @retrieved ||= false
     end
 
     def retrieve(header={})
-      response = connection.get(path, header)
+      response = connection.get(connection.path_prefix, header)
       @retrieved = true
       response.body.extend(VisitorStrategist)
     end
@@ -127,31 +122,31 @@ module Musashi::Retriever
   module DelegateHash
     include VisitorStrategist
 
-    attr_accessor :attrs
-
     def [](key)
-      @attrs = retrieve if @attrs.nil?
+      attrs
       super
     end
 
     def method_missing(sym,*args,&block)
-      @attrs = retrieve if @attrs.nil?
+      attrs
       super
     end
 
     def keys
-      @attrs = retrieve if @attrs.nil?
-      @attrs.keys
+      attrs.keys
     end
 
     def key?(key)
-      @attrs = retrieve if @attrs.nil?
-      @attrs.key?(key)
+      attrs.key?(key)
     end
 
     def fetch(*args)
-      @attrs = retrieve if @attrs.nil?
-      @attrs.fetch(*args)
+      attrs.fetch(*args)
+    end
+
+    def attrs
+      @attrs = retrieve unless retrieved?
+      @attrs
     end
 
   end
@@ -186,6 +181,7 @@ module Musashi::Retriever
       return if receiver.is_a?(Iterator)
       raise RuntimeError.new unless Iterator.extend? receiver
       receiver.each{ |item| Strategist.define(item) }
+      super
     end
   end
 

data/lib/musashi/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
 module Musashi
-  VERSION = "0.0.1.b6"
+  VERSION = "0.0.1"
 end

data/spec/connection_spec.rb

@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe Musashi::Connection do
+
+  before(:each) do
+    @resource = Object.new.extend(Musashi::Connection)
+  end
+
+  it 'should raise an error for invalid endpoint' do
+    lambda{ @resource.endpoint }.should raise_error
+    lambda{ @resource.options }.should raise_error
+    lambda{ @resource.connection }.should raise_error
+  end
+
+  it 'should have as default format json' do
+    @resource.format.should == :json
+  end
+
+  it 'should give to us a default connection resource' do
+    @resource.endpoint = 'http://foo.bar/'
+    @resource.options[:builder].should_not be_nil
+    @resource.options[:headers].should_not be_nil
+    @resource.options[:url].should_not be_nil
+    @resource.options[:ssl].should_not be_nil
+    @resource.connection.should_not be_nil
+  end
+  
+  it 'should perform get http verbs agaist endpoint' do
+    @resource.endpoint = 'http://foo.bar/'
+    FakeWeb.register_uri(:get, @resource.endpoint, :body => '{"test":"foo"}')
+    @resource.connection.get.body.test.should eq('foo')
+  end
+
+end
+

data/spec/publisher_spec.rb

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe Musashi::Publisher do
+
+  before(:each) do
+    @resource = Musashi::Resource.new('http://foo.bar/')
+    FakeWeb.register_uri(:get,  @resource.endpoint, :body => '{"foo":"bar","name":"bazz"}')
+    FakeWeb.register_uri(:post, @resource.endpoint, :payload => 'name=bar')
+  end
+
+  it 'should known what fields are dirty' do
+    @resource.attrs.size.should == 2
+    @resource.data.should be_empty
+    @resource.name.should eq('bazz')
+    @resource.name = 'bar'
+    @resource.name.should eq('bar')
+    @resource.data.size.should == 1
+  end
+
+  it 'should post ony fields are dirty' do
+    @resource.name.should eq('bazz')
+    @resource.name = 'bar'
+    @resource.name.should eq ('bar')
+    @resource.post
+  end
+
+end
+

data/spec/retriever_base_spec.rb

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe Musashi::Retriever::Base do
+
+  before(:all) do
+    @resource = Object.new.extend(Musashi::Retriever::Base)
+    @resource.endpoint = 'http://foo.bar/'
+    FakeWeb.register_uri(:get, @resource.endpoint, :body => '{"foo":"bar"}')
+  end
+
+  it 'should known if it fetched data' do
+    @resource.retrieved?.should == false
+    @resource.retrieve
+    @resource.retrieved?.should == true
+  end
+
+  it 'should fetch data and marshalled body response' do
+    @resource.retrieve.foo.should eq('bar')
+  end
+
+end
+

data/spec/sinatra/public/customers/1/provisionings

@@ -1 +1,12 @@
-{"entries":[{"id":"1234567890","parent":"0","service_key":"SERHOST0001","created_at":"2011-09-23","active":true,"status":"active"}]}
+{
+   "entries" : [
+      {
+         "created_at" : "2011-09-23",
+         "parent" : "0",
+         "service_key" : "SERHOST0001",
+         "status" : "active",
+         "active" : true,
+         "id" : "1234567890"
+      }
+   ]
+}

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
 require 'rspec'
 require 'musashi'
+require 'fakeweb'
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: musashi
 version: !ruby/object:Gem::Version
-  version: 0.0.1.b6
-  prerelease: 6
+  version: 0.0.1
+  prerelease: 
 platform: ruby
 authors:
 - pahagon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00.000000000Z
+date: 2011-10-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &14474960 !ruby/object:Gem::Requirement
+  requirement: &9140160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *14474960
+  version_requirements: *9140160
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &14474500 !ruby/object:Gem::Requirement
+  requirement: &9139460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *14474500
+  version_requirements: *9139460
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &14473840 !ruby/object:Gem::Requirement
+  requirement: &9138420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *14473840
+  version_requirements: *9138420
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &14473060 !ruby/object:Gem::Requirement
+  requirement: &9137720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.4
   type: :runtime
   prerelease: false
-  version_requirements: *14473060
+  version_requirements: *9137720
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &14472340 !ruby/object:Gem::Requirement
+  requirement: &9123940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *14472340
+  version_requirements: *9123940
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &14471680 !ruby/object:Gem::Requirement
+  requirement: &9123480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *14471680
+  version_requirements: *9123480
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &14471000 !ruby/object:Gem::Requirement
+  requirement: &9123020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,29 +87,40 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *14471000
+  version_requirements: *9123020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14470300 !ruby/object:Gem::Requirement
+  requirement: &9122220 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *14470300
+  version_requirements: *9122220
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &14469840 !ruby/object:Gem::Requirement
+  requirement: &9121760 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.2.6
+  type: :development
+  prerelease: false
+  version_requirements: *9121760
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &9121260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *14469840
+  version_requirements: *9121260
 description: ! 'Musashi is a library for '
 email: pahagon@gmail.com
 executables: []
@@ -125,10 +136,14 @@ files:
 - lib/musashi/connection.rb
 - lib/musashi/retriever.rb
 - lib/musashi/version.rb
+- lib/musashi/publisher.rb
 - lib/musashi.rb
 - lib/faraday/response/raise_http_5xx.rb
 - lib/faraday/response/raise_http_4xx.rb
+- spec/connection_spec.rb
 - spec/spec_helper.rb
+- spec/publisher_spec.rb
+- spec/retriever_base_spec.rb
 - spec/resource_spec.rb
 - spec/sinatra/public/customers/1.json
 - spec/sinatra/public/customers/1/orders
@@ -166,7 +181,10 @@ signing_key:
 specification_version: 3
 summary: Musashi is a library for
 test_files:
+- spec/connection_spec.rb
 - spec/spec_helper.rb
+- spec/publisher_spec.rb
+- spec/retriever_base_spec.rb
 - spec/resource_spec.rb
 - spec/sinatra/public/customers/1.json
 - spec/sinatra/public/customers/1/orders