logical_model 0.3.7 → 0.4.0

data/Gemfile

@@ -3,14 +3,14 @@ source "http://rubygems.org"
 
 gem "activemodel"
 gem "activesupport"
-gem "typhoeus", '0.5.0.alpha'
-gem "ethon", "0.4.2"
+gem "typhoeus", '0.5.3'
+gem "ethon", "0.5.3"
 gem "kaminari", '~> 0.13.0'
 
 group :development, :test do
   gem 'activerecord'
   gem "shoulda"
-  gem "bundler", "~> 1.1.3"
+  gem "bundler", "~> 1.2.2"
   gem "jeweler", "~> 1.6.4"
   gem "rcov"
 	gem "sqlite3-ruby"

data/Gemfile.lock

@@ -27,7 +27,7 @@ GEM
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ethon (0.4.2)
+    ethon (0.5.3)
       ffi (~> 1.0.11)
       mime-types (~> 1.18)
     ffi (1.0.11)
@@ -100,8 +100,8 @@ GEM
       sqlite3 (>= 1.3.3)
     thor (0.14.6)
     tilt (1.3.3)
-    typhoeus (0.5.0.alpha)
-      ethon (~> 0.4.2)
+    typhoeus (0.5.3)
+      ethon (~> 0.5.3)
     tzinfo (0.3.31)
 
 PLATFORMS
@@ -111,8 +111,8 @@ DEPENDENCIES
   activemodel
   activerecord
   activesupport
-  bundler (~> 1.1.3)
-  ethon (= 0.4.2)
+  bundler (~> 1.2.2)
+  ethon (= 0.5.3)
   gemcutter
   guard-rspec
   jeweler (~> 1.6.4)
@@ -125,4 +125,4 @@ DEPENDENCIES
   shoulda
   sinatra (~> 1.2.6)
   sqlite3-ruby
-  typhoeus (= 0.5.0.alpha)
+  typhoeus (= 0.5.3)

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.4.0

data/lib/logical_model.rb

@@ -4,6 +4,7 @@ require 'typhoeus'
 require 'active_support/all' # todo migrate to yajl
 require 'logger'
 require 'kaminari'
+require 'ssl_support'
 require 'safe_log'
 
 # Logical Model, not persistant on DB, works through API. (replaces ActiveResource)
@@ -42,6 +43,7 @@ require 'safe_log'
 #  RemoteResource#destroy
 class LogicalModel
 
+  include SslSupport
   extend SafeLog
 
   # include ActiveModel Modules that are usefull
@@ -75,12 +77,11 @@ class LogicalModel
   class << self
     attr_accessor :host, :hydra, :resource_path, :api_key, :api_key_name,
                   :timeout, :retries,
-                  :use_ssl, :use_api_key, :enable_delete_multiple,
+                  :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
     def delete_multiple_enabled?; @enable_delete_multiple ||= false; end
@@ -106,9 +107,8 @@ class LogicalModel
   end
 
   def self.resource_uri(id=nil)
-    prefix = (use_ssl)? "https://" : "http://"
     sufix  = (id.nil?)? "" : "/#{id}"
-    "#{prefix}#{host}#{resource_path}#{sufix}"
+    "#{url_protocol_prefix}#{host}#{resource_path}#{sufix}"
   end
 
   def initialize(attributes={})

data/lib/ssl_support.rb

@@ -0,0 +1,39 @@
+module SslSupport
+
+  def self.included(base)
+    base.class.send(:attr_accessor, :use_ssl)
+    base.send(:include, InstanceMethods)
+    base.send(:extend, ClassMethods)
+  end
+
+  module InstanceMethods
+
+  end
+
+  module ClassMethods
+    ##
+    # Default use_ssl to ssl_recommend?
+    # @return [Boolean]
+    def use_ssl?
+      @use_ssl ||= ssl_recommended?
+    end
+
+    # @return [String]
+    def url_protocol_prefix
+      (use_ssl?)? "https://" : "http://"
+    end
+
+    # Returns true if ssl is recommended according to environment.
+    #
+    # - production, staging -> true
+    # - other -> false
+    #
+    # @return [Boolean]
+    def ssl_recommended?
+      ssl_recommended_environments = %W(production staging)
+      ssl_recommended_environments.include?(defined?(Rails)? Rails.env : ENV['RACK_ENV'] )
+    end
+  end
+
+
+end

data/logical_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "logical_model"
-  s.version = "0.3.7"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dwayne Macgowan"]
-  s.date = "2012-10-05"
+  s.date = "2012-11-30"
   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 = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "db/migrate/001_create_users.rb",
     "lib/logical_model.rb",
     "lib/safe_log.rb",
+    "lib/ssl_support.rb",
     "lib/typhoeus_fix/array_decoder.rb",
     "logical_model.gemspec",
     "models/user.rb",
@@ -53,12 +54,12 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activemodel>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<typhoeus>, ["= 0.5.0.alpha"])
-      s.add_runtime_dependency(%q<ethon>, ["= 0.4.2"])
+      s.add_runtime_dependency(%q<typhoeus>, ["= 0.5.3"])
+      s.add_runtime_dependency(%q<ethon>, ["= 0.5.3"])
       s.add_runtime_dependency(%q<kaminari>, ["~> 0.13.0"])
       s.add_development_dependency(%q<activerecord>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.2.2"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
@@ -72,12 +73,12 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<activemodel>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<typhoeus>, ["= 0.5.0.alpha"])
-      s.add_dependency(%q<ethon>, ["= 0.4.2"])
+      s.add_dependency(%q<typhoeus>, ["= 0.5.3"])
+      s.add_dependency(%q<ethon>, ["= 0.5.3"])
       s.add_dependency(%q<kaminari>, ["~> 0.13.0"])
       s.add_dependency(%q<activerecord>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.1.3"])
+      s.add_dependency(%q<bundler>, ["~> 1.2.2"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
@@ -92,12 +93,12 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activemodel>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<typhoeus>, ["= 0.5.0.alpha"])
-    s.add_dependency(%q<ethon>, ["= 0.4.2"])
+    s.add_dependency(%q<typhoeus>, ["= 0.5.3"])
+    s.add_dependency(%q<ethon>, ["= 0.5.3"])
     s.add_dependency(%q<kaminari>, ["~> 0.13.0"])
     s.add_dependency(%q<activerecord>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.1.3"])
+    s.add_dependency(%q<bundler>, ["~> 1.2.2"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])

data/spec/client_spec.rb

@@ -147,7 +147,7 @@ describe "LogicalModel User client" do
         response = mock(
             code: 200,
             body: {}.to_json,
-            request: mock(url: "server?keyname=secret_api_key"),
+            effective_url: "server?keyname=secret_api_key",
             time: 1234
         )
         Logger.any_instance.should_receive(:info).with(/\[SECRET\]/)
@@ -192,7 +192,7 @@ describe "LogicalModel User client" do
 
   describe "delete_multiple" do
     before do
-      Typhoeus::Request.stub!(:delete).and_return(mock_response(body: 'ok'))
+      Typhoeus::Request.stub!(:delete).and_return(mock_response(body: 'ok', effective_url: 'mocked-url'))
     end
     context "when disabled" do
       it "should raise exception" do

data/test/typhoeus_mocks.rb

@@ -15,7 +15,7 @@ module TyphoeusMocks
         collection: options[:collection] || [],
         total: options[:total] || 0
       }.to_json,
-      request: mock(url: options[:url] || "mockedurl"),
+      effective_url: options[:url] || 'mockedurl',
       time: 1234
     )
     req.stub(:on_complete).and_yield(response)
@@ -32,6 +32,7 @@ module TyphoeusMocks
     response = mock(
       code: options[:status] || 200,
       body: options[:attributes].to_json,
+      effective_url: options[:url] || 'mockedurl',
       request: mock(url: options[:url] || "mockedurl"),
       time: 1234
     )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logical_model
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.alpha
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.alpha
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: ethon
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -324,6 +324,7 @@ files:
 - db/migrate/001_create_users.rb
 - lib/logical_model.rb
 - lib/safe_log.rb
+- lib/ssl_support.rb
 - lib/typhoeus_fix/array_decoder.rb
 - logical_model.gemspec
 - models/user.rb
@@ -346,7 +347,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 421922081
+      hash: 474549263
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: