rfid_api 0.0.2 → 0.0.4

data/Gemfile

@@ -2,3 +2,9 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in rfid_api.gemspec
 gemspec
+
+group :test do
+  gem "rspec", "~> 2.7.0"
+  gem 'rack-test'
+  gem "fakeweb", "~> 1.3.0"
+end

data/lib/rfid_api/client.rb

@@ -1,13 +1,14 @@
+require "active_support/core_ext"
 require "active_model"
 require "httparty"
 require "ostruct"
-require 'yajl/json_gem'
+require "yajl/json_gem"
 
 module RfidApi
-  class Client < OpenStruct
+  class Client < ::OpenStruct
     include ::HTTParty
     
-    extend ActiveModel::Naming
+    extend ::ActiveModel::Naming
     
     # https://rfidapi.aimbulance.com/api/v1/devices.xml
     base_uri File.join("https://rfidapi.aimbulance.com", "api", RfidApi.api_version)
@@ -17,6 +18,8 @@ module RfidApi
     
     delegate :create, :update, :get, :plural_name, :format, :resources, :to => "self.class"
     
+    attr_writer :destroyed
+    
     class << self
     
       # Gets the resource_name
@@ -40,7 +43,8 @@ module RfidApi
       end
       
       def update(id, attributes)
-        resource put("/#{plural_name}/#{id}.#{format}", :body => { singular_name => attributes })
+        response = put("/#{plural_name}/#{id}.#{format}", :body => { singular_name => attributes })
+        resource(response, attributes)
       end
       
       def all(options = {})
@@ -52,7 +56,9 @@ module RfidApi
       end
       
       def destroy(id)
-        resource delete("/#{plural_name}/#{id}.#{format}")
+        record = resource( delete("/#{plural_name}/#{id}.#{format}") )
+        record.destroyed = (record && record.valid?)
+        record
       end
       
       def model_name
@@ -69,26 +75,16 @@ module RfidApi
           @plural_name ||= resource_name.to_s.downcase.pluralize
         end
         
-        def resources(response, options = {})
-          if response
+        def resources(response, attributes = {})
+          if response && [200, 201, 422].include?(response.code)
             body = post_parse(response.parsed_response)
-            
-            if [200, 201].include?(response.code)
-              [body].flatten.collect { |item| new(item) }
-            elsif [422].include?(response.code)
-              [body].flatten.collect do |item| 
-                item = new(options)
-                item.errors = body[singular_name]["errors"]
-                item
-              end
-            else
-              nil
-            end
+            [body].flatten.collect { |item| new(item) }
           end
         end
         
-        def resource(resource, options = {})
-          resources(resource, options).first
+        def resource(response, attributes = {})
+          array = resources(response, attributes)
+          array.nil? ? nil : array.first
         end
         
         def post_parse(body)
@@ -101,6 +97,14 @@ module RfidApi
         end
     end
     
+    def initialize(hash = nil)
+      if hash && (hash[:errors] || hash['errors'])
+        self.errors = (hash.delete(:errors) || hash.delete('errors'))
+      end
+      
+      super(hash)
+    end
+    
     def to_key
       [_id]
     end
@@ -114,10 +118,7 @@ module RfidApi
     end
     
     def destroy
-      unless new_record?
-        self.class.destroy(_id)
-        @destroyed = true
-      end
+      self.class.destroy(_id) unless new_record?
     end
     
     def new_record?
@@ -125,11 +126,15 @@ module RfidApi
     end
     
     def persisted?
-      !(new_record? || destroyed?)
+      !(new_record? || destroyed?) && valid?
     end
     
     def destroyed?
-      @destroyed == true
+      @destroyed === true
+    end
+    
+    def valid?
+      errors.empty?
     end
     
     def errors
@@ -142,13 +147,20 @@ module RfidApi
       end
     end
     
+    def read_attribute(name)
+      @table[name.to_sym]
+    end
+    
+    def write_attribute(name, value)
+      @table[name.to_sym] = value
+    end
+    
     def datetime(colum_name)
       begin
         DateTime.parse(send(colum_name))
       rescue Exception => e
         nil
       end
-    end
-      
+    end      
   end
 end

data/lib/rfid_api/version.rb

@@ -1,3 +1,3 @@
 module RfidApi
-  VERSION = "0.0.2".freeze
+  VERSION = "0.0.4".freeze
 end

data/spec/models/device_spec.rb

@@ -0,0 +1,96 @@
+require "spec_helper"
+
+describe RfidApi::Device do
+  include ModelsHelper
+  
+  it "should be valid" do
+    RfidApi::Device.should be_a(Class)
+  end
+  
+  it "should get devices" do
+    FakeWeb.register_uri(:get, File.join(rfid_url, "devices.json"), 
+      :body => [device_attrs, device_attrs("_id" => 2) ].to_json)
+    
+    devices = RfidApi::Device.all
+    devices.should_not be_empty
+  end
+  
+  it "should get one device" do
+    attrs = device_attrs("_id" => "4e312bafc546615929000001")
+    
+    FakeWeb.register_uri(:get, File.join(rfid_url, "devices", "#{attrs['_id']}.json"), 
+      :body => attrs.to_json)
+    
+    device = RfidApi::Device.find(attrs["_id"])
+    
+    attrs.each do |key, value|
+      device.send(key).should == JSON.parse(value.to_json)
+    end
+  end
+  
+  it "should return nil if RFID service not available" do
+    id = "4e312bafc546615929000001"
+    FakeWeb.register_uri(:get, File.join(rfid_url, "devices", "#{id}.json"), 
+      :body => '{"error":{"message":"Some error","info":"Some error"}}', :status => ["500", "Service not available"])
+    
+    device = RfidApi::Device.find(id)
+    device.should be_nil
+  end
+  
+  context "create/update/destroy" do
+    before(:each) do
+      @attrs = device_attrs("title" => "Test device")
+      @attrs.delete_if {|key, value| ["_id", "created_at", "updated_at", "relays"].include?(key) } 
+    end
+    
+    it "should create new device" do
+      FakeWeb.register_uri(:post, File.join(rfid_url, "devices.json"), 
+        :body => '{"created_at":"2011-12-06T13:24:13+02:00","latitude":0.0,"secret_token":"sfoYxCgnYkCuNvZCpgxH","title":"Test device","updated_at":"2011-12-06T13:24:13+02:00","_id":"4eddfb5dc546612e14000063","longitude":0.0}')
+            
+      device = RfidApi::Device.create(@attrs)
+      device.secret_token.should_not == @attrs['secret_token']
+      device.title.should == @attrs['title']
+      device.to_param.should_not be_blank
+      device.should_not be_new_record
+      device.should be_persisted
+    end
+    
+    it "should not create new device with invalid params" do
+      FakeWeb.register_uri(:post, File.join(rfid_url, "devices.json"), 
+        :body => '{"created_at":null,"latitude":"wrong","secret_token":"2ny2RWAsSn7cRVlxmsVI","title":"","updated_at":null,"_id":"4eddfc65c546612e14000066","errors":{"title":["can\'t be blank"],"latitude":["is not a number"]},"longitude":0.0}')
+      
+      @attrs["title"] = ''
+      @attrs["latitude"] = 'wrong'     
+      
+      device = RfidApi::Device.create(@attrs)
+      device.secret_token.should_not == @attrs['secret_token']
+      device.title.should == @attrs['title']
+      device.latitude.should == @attrs['latitude']
+      device.errors.should_not be_empty
+      device.should_not be_valid
+      device.should_not be_persisted
+    end
+    
+    it "should update device by id" do
+      id = "4eddfb5dc546612e14000063"
+      
+      FakeWeb.register_uri(:put, File.join(rfid_url, "devices", "#{id}.json"), 
+        :body => '{"created_at":"2011-12-06T13:24:13+02:00","latitude":0.0,"secret_token":"sfoYxCgnYkCuNvZCpgxH","title":"Update","updated_at":"2011-12-06T13:24:13+02:00","_id":"4eddfb5dc546612e14000063","longitude":0.0}')
+      
+      device = RfidApi::Device.update(id, :title => "Update")
+      device.title.should == "Update"
+      device.should be_valid
+      device.should be_persisted
+    end
+    
+    it "should destroy device by id" do
+      id = "4eddfb5dc546612e14000063"
+      
+      FakeWeb.register_uri(:delete, File.join(rfid_url, "devices", "#{id}.json"), 
+        :body => '{"created_at":"2011-12-06T13:24:13+02:00","latitude":0.0,"secret_token":"sfoYxCgnYkCuNvZCpgxH","title":"Noname","updated_at":"2011-12-06T13:24:13+02:00","_id":"4eddfb5dc546612e14000063","longitude":0.0}')
+      
+      device = RfidApi::Device.destroy(id)
+      device.should be_destroyed
+    end
+  end
+end

data/spec/rfid_api_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe RfidApi do
+  it "should be valid" do
+    RfidApi.should be_a(Module)
+  end
+  
+  context "setup" do
+    before(:each) do
+      RfidApi.setup do |config|
+        config.username = "user"
+        config.password = "pass"
+        config.format = :json
+        config.api_version = "v2"
+      end
+    end
+    
+    it "should set config options" do
+      RfidApi.username.should == "user"
+      RfidApi.password.should == "pass"
+      RfidApi.format.should == :json
+      RfidApi.api_version.should == "v2"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,33 @@
+require "rubygems"
+require "bundler/setup"
+
+$:.push File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require "rfid_api"
+require "fakeweb"
+
+# Load support files
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+RfidApi.setup do |config|
+  config.username = 'user'
+  config.password = 'password'
+  config.logger = nil
+end
+
+RSpec.configure do |config|
+  # Remove this line if you don't want RSpec's should and should_not
+  # methods or matchers
+  require 'rspec/expectations'
+  config.include RSpec::Matchers
+
+  # == Mock Framework
+  config.mock_with :rspec
+  
+  config.before(:suite) do
+    FakeWeb.allow_net_connect = false
+  end
+  
+  config.after(:suite) do
+    FakeWeb.allow_net_connect = true
+  end
+end

data/spec/support/helpers/models_helper.rb

@@ -0,0 +1,23 @@
+module ModelsHelper
+  def rfid_auth
+    [RfidApi.username, RfidApi.password].join(':')
+  end
+  
+  def rfid_url
+    "https://#{rfid_auth}@rfidapi.aimbulance.com/api/v1"
+  end
+  
+  def device_attrs(attrs = {})
+    attrs = {
+      "relays" => [],
+      "created_at" => Time.now,
+      "latitude" => 0,
+      "secret_token" => "Tpj1gs26b5XJPikc36ST",
+      "title" => "Noname",
+      "updated_at" => Time.now,
+      "_id" => "4e312bafc546615929000001",
+      "longitude" => 0,
+      "action_klass_name" => "DefaultAction"
+    }.merge(attrs)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rfid_api
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Igor Galeta
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-29 00:00:00 +03:00
-default_executable: 
+date: 2011-12-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
@@ -101,7 +100,10 @@ files:
 - lib/rfid_api/social_account.rb
 - lib/rfid_api/version.rb
 - rfid_api.gemspec
-has_rdoc: true
+- spec/models/device_spec.rb
+- spec/rfid_api_spec.rb
+- spec/spec_helper.rb
+- spec/support/helpers/models_helper.rb
 homepage: https://github.com/galetahub/rfid_api
 licenses: []
 
@@ -131,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rfid_api
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple client for RFID API