LVS-JSONService 0.2.1 → 0.2.2

data/.specification

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: LVS-JSONService 
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 require_paths:
 - lib
 platform: ruby

data/JSONService.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{JSONService}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["LVS"]
-  s.date = %q{2009-06-19}
+  s.date = %q{2009-06-24}
   s.email = %q{info@lvs.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/lvs/json_service/base.rb

@@ -56,7 +56,7 @@ module LVS
         
         def site=(value)
           # value is containing AGP_LOCATION already sometimes:
-          value.gsub!(/^#{AGP_LOCATION}/, '') if AGP_LOCATION && value.match(/#{AGP_LOCATION}/)
+          value.gsub!(/^#{AGP_LOCATION}/, '') if defined?(AGP_LOCATION) && value.match(/#{AGP_LOCATION}/)
           agp = @agp_location ? @agp_location : AGP_LOCATION
           agp.gsub!(/\/$/, '')
           value.gsub!(/^\//, '')
@@ -111,7 +111,7 @@ module LVS
           add_service(name)
         end
 
-        def fake_service(name, json)
+        def fake_service(name, json, options = {})
           (class<<self;self;end).send :define_method, name do |*args|
             self.parse_result(JSON.parse(json))
           end
@@ -135,16 +135,27 @@ module LVS
       def initialize(values = {})
         values.each_pair do |key, value|
           key = key.underscore
-          self.class.send(:define_method, key, proc {self.instance_variable_get("@#{key}")})
-          self.class.send(:define_method, "#{key}=", proc {|value| self.instance_variable_set("@#{key}", value)})
+          new_instance_methods = "
+            def #{key}
+              @#{key}
+            end
+            def #{key}=(value)
+              @#{key} = value
+            end
+          "
 
           # If the key starts with has_ create alias to has_ method removing has
           # and putting ? at the end
           if key =~ /^has_/
             temp_key = "#{key.gsub(/^has_/, '')}?"
-            self.class.send(:define_method, temp_key, proc {self.instance_variable_get("@#{key}")})
-            self.class.send(:define_method, "#{temp_key}=", proc {|value| self.instance_variable_set("@#{key}", value)})
-          end
+            new_instance_methods << "
+              def #{temp_key}
+                @#{key}
+              end
+             "
+           end
+
+          self.instance_eval(new_instance_methods)
 
           if value.is_a?(Hash)
             self.instance_variable_set("@#{key}", self.class.new(value))

data/lib/lvs/json_service/logger.rb

@@ -1,9 +1,12 @@
+require 'pp'
 module LVS
   module JsonService
     module Logger
       def self.debug(message)
-        message = "  \033[1;4;32mLVS::JsonService\033[0m #{message}"
-        Rails.logger.debug(message)
+        if defined?(Rails) && Rails.logger
+          message = "  \033[1;4;32mLVS::JsonService\033[0m #{message}"
+          Rails.logger.debug(message)
+        end
       end
     end
   end

data/spec/lvs/json_service/logger_spec.rb

@@ -1,28 +1,42 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
+
 describe LVS::JsonService::Logger do
   before :each do
   end
 
   describe "debug" do
-    describe "with RAILS_DEFAULT_LOGGER set" do
+    describe "with Rails.logger set" do
       before :each do
         @mock_logger = mock()
-        LVS::JsonService::Logger.const_set(:RAILS_DEFAULT_LOGGER, @mock_logger)
+        
+        if !defined?(Rails)
+          class Rails
+            class << self
+              def logger=(value)
+                @logger = value
+              end
+              def logger
+                @logger
+              end
+            end
+          end
+        end
+        
+        Rails.logger = @mock_logger
       end
 
-      it "should pass the message to RAILS_DEFAULT_LOGGER" do
+      it "should pass the message to Rails.logger" do
         message = "Some debug message"
-        @mock_logger.should_receive(:debug).with(message)
+        coloured_message = "  \033[1;4;32mLVS::JsonService\033[0m #{message}"
+        @mock_logger.should_receive(:debug).with(coloured_message)
         LVS::JsonService::Logger.debug(message)
       end
     end
 
-    describe "without RAILS_ROOT set" do
+    describe "without Rails defined" do
       before :each do
-        LVS::JsonService::Logger.module_eval do
-          remove_const(:RAILS_DEFAULT_LOGGER) if const_defined?(:RAILS_DEFAULT_LOGGER)
-        end
+        Object.send(:remove_const, :Rails)
       end
 
       it "should not raise an exception" do

data/spec/lvs/json_service/request_spec.rb

@@ -250,5 +250,9 @@ end
 
 class ClassWithRequest
   include LVS::JsonService::Request
+  
+  def self.require_ssl?
+    false
+  end
 end
 

data/spec/spec_helper.rb

@@ -1,8 +1,6 @@
 require 'spec'
-
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rubygems'
 require 'json_service'
 
 Spec::Runner.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: LVS-JSONService
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - LVS
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-19 00:00:00 -07:00
+date: 2009-06-24 00:00:00 -07:00
 default_executable: 
 dependencies: []