logical_model 0.2.18 → 0.2.19

data/VERSION

@@ -1 +1 @@
-0.2.18
+0.2.19

data/lib/logical_model.rb

@@ -68,13 +68,16 @@ class LogicalModel
   end
 
   DEFAULT_TIMEOUT = 10000
+  DEFAULT_RETRIES = 3
 
   class << self
-    attr_accessor :host, :hydra, :resource_path, :api_key, :api_key_name, :timeout,
+    attr_accessor :host, :hydra, :resource_path, :api_key, :api_key_name,
+                  :timeout, :retries,
                   :use_ssl, :use_api_key, :enable_delete_multiple,
                   :json_root, :log_path
 
     def timeout; @timeout ||= DEFAULT_TIMEOUT; end
+    def retries; @retries ||= DEFAULT_RETRIES; end
     def use_ssl; @use_ssl ||= false; end
     def log_path; @log_path ||= "log/logical_model.log"; end
     def use_api_key; @use_api_key ||= false; end
@@ -324,14 +327,19 @@ class LogicalModel
   #synchronic pagination
   def self.paginate(options={})
     result = nil
-    async_paginate(options){|i| result = i}
-    Timeout::timeout(self.timeout/1000) do
-      self.hydra.run
+    self.retries.times do
+      begin
+        async_paginate(options){|i| result = i}
+        Timeout::timeout(self.timeout/1000) do
+          self.hydra.run
+        end
+        break unless result.nil?
+      rescue Timeout::Error
+        self.logger.warn("timeout")
+        result = nil
+      end
     end
     result
-  rescue Timeout::Error
-    self.logger.warn("timeout")
-    return nil
   end
 
   # Asynchronic Count
@@ -437,9 +445,9 @@ class LogicalModel
     params = self.class.merge_key(params)
 
     response = nil
-    Timeout::timeout(self.class.timeout/1000) do
+    #Timeout::timeout(self.class.timeout/1000) do
       response = Typhoeus::Request.post( self.class.resource_uri, :params => params, :timeout => self.class.timeout )
-    end
+    #end
     if response.code == 201
       log_ok(response)
       self.id = ActiveSupport::JSON.decode(response.body)["id"]

data/logical_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "logical_model"
-  s.version = "0.2.18"
+  s.version = "0.2.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dwayne Macgowan"]
-  s.date = "2012-07-21"
+  s.date = "2012-08-19"
   s.description = "LogicalModel allows to use a resource as a model. It is based on web presentation http://www.slideshare.net/ihower/serviceoriented-design-and-implement-with-rails3"
   s.email = "dwaynemac@gmail.com"
   s.extra_rdoc_files = [
@@ -35,9 +35,7 @@ Gem::Specification.new do |s|
     "lib/safe_log.rb",
     "logical_model.gemspec",
     "models/user.rb",
-    "service.rb",
     "spec/client_spec.rb",
-    "spec/service_spec.rb",
     "test/helper.rb",
     "test/test_logical_model.rb",
     "test/typhoeus_mocks.rb"

data/spec/client_spec.rb

@@ -3,18 +3,13 @@ require File.dirname(__FILE__) + '/../client'
 require File.dirname(__FILE__) + '/../test/typhoeus_mocks.rb'
 include TyphoeusMocks
 
-# NOTE: to run these specs you must have the service running locally. Do like this:
-# ruby service.rb -p 3000 -e test
-
-# Also note that after a single run of the tests the server must be restarted to reset
-# the database. We could change this by deleting all users in the test setup.
 describe "LogicalModel User client" do
 
   describe "#create" do
     context "with valid attributes" do
       before(:each) do
-        # TODO mock service
-        @user = User.new({:name => "paul", 
+        mock_post_with(code: 201, body: {'id' => 3}.to_json)
+        @user = User.new({:name => "paul",
                           :email => "paul@pauldix.net", 
                           :password => "strongpass", 
                           :bio => "rubyist"})
@@ -34,21 +29,34 @@ describe "LogicalModel User client" do
   end
 
   describe "#paginate" do
-    before do
-      mock_index(
-        collection: [{name:'a',email:'a@m'},
-                     {name:'b',email:'b@m'},
-                     {name:'c',email:'c@m'}],
-        total: 6
-      )
-
-      @users = User.paginate(page:1, per_page:1)
-    end
-    it "should return a Kaminari::PaginatableArray" do
-      @users.should be_a(Kaminari::PaginatableArray)
+    context "when successfull" do
+      before do
+        mock_index(
+            collection: [{name:'a',email:'a@m'},
+                         {name:'b',email:'b@m'},
+                         {name:'c',email:'c@m'}],
+            total: 6
+        )
+        @users = User.paginate(page:1, per_page:1)
+      end
+      it "should return a Kaminari::PaginatableArray" do
+        @users.should be_a(Kaminari::PaginatableArray)
+      end
+      it "should set total_count" do
+        @users.total_count.should == 6
+      end
     end
-    it "should set total_count" do
-      @users.total_count.should == 6
+    context "when it fails" do
+      before do
+        req = Typhoeus::Request.any_instance
+        response = mock( code: 500, body: "error", request: "mockedurl", time: 1234 )
+        req.stub(:on_complete).and_yield(response)
+      end
+      it "should retry LogicalModel#retries times (default: 3)" do
+        User.retries= 2
+        LogicalModel.should_receive(:async_paginate).exactly(2)
+        User.paginate(page:1,per_page:1).should be_nil
+      end
     end
   end
 

data/test/typhoeus_mocks.rb

@@ -45,11 +45,11 @@ module TyphoeusMocks
   # @option [String] url - requested url
   # @return [Typhoeus::Response]
   def mock_response(options={})
-    mock_response = Typhoeus::Response.new(
-         :code => options[:code] || 200,
-         :headers => "whatever",
-         :time => 0.1,
-         :body => options[:body])
+    mock_response = Typhoeus::Response.new()
+    mock_response.stub(:code).and_return(options[:code]||200)
+    mock_response.stub(:headers).and_return('whatever')
+    mock_response.stub(:time).and_return(0.1)
+    mock_response.stub(:body).and_return options[:body]
     mock_response.stub!(:request).and_return(mock(:url => options[:url] || "mocked-url"))
     mock_response
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logical_model
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -310,9 +310,7 @@ files:
 - lib/safe_log.rb
 - logical_model.gemspec
 - models/user.rb
-- service.rb
 - spec/client_spec.rb
-- spec/service_spec.rb
 - test/helper.rb
 - test/test_logical_model.rb
 - test/typhoeus_mocks.rb
@@ -331,7 +329,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -435742029
+      hash: 430038925
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/service.rb

@@ -1,83 +0,0 @@
-require 'rubygems'
-require 'bundler/setup'
-require 'active_record'
-require 'sinatra'
-require './models/user'
-
-# setting up the environment
-env_index = ARGV.index("-e")
-env_arg = ARGV[env_index + 1] if env_index
-env = env_arg || ENV["SINATRA_ENV"] || "development"
-databases = YAML.load_file("config/database.yml")
-ActiveRecord::Base.establish_connection(databases[env])
-
-if env == "test"
-  puts "starting in test mode"
-  User.destroy_all
-  User.create(:name => "paul", :email => "paul@pauldix.net", :bio => "rubyist")
-end
-
-# Simple RESTfull Service
-# for LogicalModel Testing
-
-# index
-# Responds { collection, total }
-get 'api/v1/users' do
-  users = User.all
-
-  { collection: users, total: users.count}.to_json
-end
-
-# HTTP entry points
-# get a user by name
-get '/api/v1/users/:name' do
-  user = User.find_by_name(params[:name])
-  if user
-    user.to_json
-  else
-    error 404, {:error => "user not found"}.to_json
-  end
-end
-
-# create a new user
-post '/api/v1/users' do
-  begin
-    user = User.new(params[:user])
-    if user.save
-      [201, {id: user.id}.to_json]
-    else
-      error 400, {:errors => user.errors}.to_json
-    end
-  rescue => e
-    error 500, {:errors => e.message}.to_json
-  end
-end
-
-# update an existing user
-put '/api/v1/users/:name' do
-  user = User.find_by_name(params[:name])
-  if user
-    begin
-      if user.update_attributes(params[:user])
-        user.to_json
-      else
-        error 400, user.errors.to_json
-      end
-    rescue => e
-      error 400, e.message.to_json
-    end
-  else
-    error 404, {:error => "user not found"}.to_json
-  end
-end
-
-# destroy an existing user
-delete '/api/v1/users/:name' do
-  user = User.find_by_name(params[:name])
-  if user
-    user.destroy
-    user.to_json
-  else
-    error 404, {:error => "user not found"}.to_json
-  end
-end

data/spec/service_spec.rb

@@ -1,139 +0,0 @@
-require File.dirname(__FILE__) + '/../service'
-
-require 'rspec'
-require 'rack/test'
-require 'test/unit'
-require 'sinatra'
-require 'json'
-#require 'rspec/interop/test'
-
-set :environment, :test
-Test::Unit::TestCase.send :include, Rack::Test::Methods
-
-def app
-  Sinatra::Application
-end
-
-RSpec.configure do |conf|                    #from Jason
-  conf.include Rack::Test::Methods
-end
-
-describe "v1 service: " do
-  before(:each) do
-    User.delete_all
-  end
-
-  describe "get /api/v1/users" do
-    before do
-      User.create(name: "dwayne", email: "dwaynemac@gmail.com", password: "asdf", bio: "test")
-      User.create(name: "2dwayne", email: "dw2aynemac@gmail.com", password: "a2sdf", bio: "te2st")
-      get '/api/v1/users'
-    end
-    it { should respond_with :success }
-    it "should send collection" do
-      ActiveSupport::JSON.decode(last_response.body)['collection'].should_not be_nil
-    end
-    it "should send total items number" do
-      AcriveSupport::JSON.decode(last_response.body)['total'].should == 2
-    end
-  end
-
-  describe "RESTfull GET (on /api/v1/users/:id)" do
-    context "for existing user" do
-      before(:each) do
-        User.create(
-                      :name => "paul",
-                      :email => "paul@pauldix.net",
-                      :password => "strongpass",
-                      :bio => "rubyist")
-        get '/api/v1/users/paul'
-      end
-      it "should respond with 200" do
-        last_response.status.should == 200      
-      end
-      it "should return user with id paul" do
-        attributes = JSON.parse(last_response.body)["user"]
-        attributes["name"].should == "paul"
-      end
-      it "should return users email" do
-        attributes = JSON.parse(last_response.body)["user"]
-        attributes["email"].should == "paul@pauldix.net"
-      end
-      it "should not return a user's password" do
-        attributes = JSON.parse(last_response.body)["user"]
-        attributes.should_not have_key("password")
-      end
-      it "should return user's bio" do
-        attributes = JSON.parse(last_response.body)["user"]
-        attributes["bio"].should == "rubyist"
-      end      
-    end
-    context "for un-existing user" do
-      before do
-        get '/api/v1/users/foo'
-      end
-      it "should return not found" do
-        last_response.status.should == 404
-      end
-    end
-  end
-  
-  describe "RESTfull POST (on /api/v1/users) with attributes under resource name" do
-    it "should create a user" do
-      expect{post '/api/v1/users', :user => { :name => "trotter",
-                              :email => "no spam",
-                              :password => "whatever",
-                              :bio => "southern belle" }}.to change{User.count}.by 1
-      last_response.should be_ok
-      
-      get '/api/v1/users/trotter'
-      attributes = JSON.parse(last_response.body)["user"]
-      attributes["name"].should == "trotter"
-      attributes["email"].should == "no spam"
-      attributes["bio"].should == "southern belle"
-    end
-  end
-
-  describe "RESTfull PUT (on /api/v1/users/:id) with params under resourcename" do
-    it "should update a user" do
-      User.create(
-                    :name => "bryan",
-                    :email => "no spam",
-                    :password => "whatever",
-                    :bio => "rspec master")
-                    
-      put '/api/v1/users/bryan', :user => {:bio => "testing freak"}
-      
-      last_response.status.should == 200
-      
-      get '/api/v1/users/bryan'
-      attributes = JSON.parse(last_response.body)["user"]
-      attributes["bio"].should == "testing freak"
-    end
-    context "when called with unexisting id" do
-      before do
-        put "/api/v1/users/no-existo"
-      end
-      it "should return not found" do
-        last_response.status.should == 404
-      end
-    end
-  end
-  
-  describe "RESTfull DELETE (on /api/v1/users/:id)" do
-  it "should delete a user" do
-    User.create(
-                  :name => "francis",
-                  :email => "no spam",
-                  :password => "whatever",
-                  :bio => "williamsburg hipster")
-    
-    expect{delete '/api/v1/users/francis'}.to change{User.count}.by -1
-    
-    last_response.should be_ok
-    
-    get '/api/v1/users/francis'
-    last_response.status.should == 404
-    end
-  end
-end