mios 0.1.1 → 0.2.0

data/lib/mios.rb

@@ -1,4 +1,5 @@
-require 'httparty'
+require 'httpclient'
+require 'multi_json'
 require "mios/version"
 require "mios/interface"
 require "mios/device"

data/lib/mios/action.rb

@@ -7,19 +7,19 @@ module MiOS
     end
     
     def take(async=false, &block)
-      response = @device.class.get url
+      response = MultiJson.load(@device.client.get("#{@device.base_uri}/data_request", url_params).content)
       # Are there ever more than one jobs from a device action?
       Job.new(@device, response.values.first['JobID'], async, &block)
     end
 
-    def url
-      url = "/data_request?output_format=json&id=action"
-      url += "&DeviceNum=#{@device.id}"
-      url += "&action=#{@action}"
-      url += "&serviceId=#{@service_id}&"
-      url += @parameters.map { |k, v|
-        "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"
-      }.join("&")
+    def url_params
+      {
+        :id => 'action',
+        :DeviceNum => @device.attributes["id"],
+        :action => @action,
+        :serviceId => @service_id,
+        :output_format => :json,
+      }.merge(@parameters)
     end
   end
 end

data/lib/mios/device.rb

@@ -1,93 +1,80 @@
 module MiOS
   class Device
+    attr_reader :attributes, :client, :base_uri
 
-    class << self
-      def new(uri, *args)
-        Class.new(AbstractInterface) { |klass|
-          klass.base_uri(uri)
-        }.new(*args)
-      end
+    def initialize(client, base_uri, data)
+      @client, @base_uri = client, base_uri
+      parse(data)
     end
 
-    class AbstractInterface
-      include HTTParty
-      format :json
-
-      attr_reader :attributes
-
-      def initialize(data)
-        parse(data)
-      end
-
-      def inspect
-        "#<MiOS::Device:0x#{'%x' % (self.object_id << 1)} name=#{@attributes['name']}>"
-      end
+    def inspect
+      "#<MiOS::Device:0x#{'%x' % (self.object_id << 1)} name=#{@attributes['name']}>"
+    end
 
-      def method_missing(method, *args)
-        if @attributes.has_key?(method.to_s)
-          @attributes[method.to_s]
-        else
-          super
-        end
+    def method_missing(method, *args)
+      if @attributes.has_key?(method.to_s)
+        @attributes[method.to_s]
+      else
+        super
       end
+    end
 
-      def reload
-        parse(self.class.get("/data_request?id=status&DeviceNum=#{id}").parsed_response["Device_Num_#{id}"], true)
-        
-        self
-      end
-      
-      private
-      
-      def set(urn, action, params, async=false, &block)
-        MiOS::Action.new(self, urn, action, params).take(async, &block)
-      end
-      
-      def timestamp_for(urn, key)
-        Time.at integer_for(urn, key)
-      end
+    def reload
+      parse(MultiJson.load(@client.get("#{@base_uri}/data_request", {:id => 'status', :DeviceNum => attributes['id'], :output_format => :json}).content)["Device_Num_#{attributes['id']}"], true)
       
-      def boolean_for(urn, key)
-        integer_for(urn, key) == 1
-      end
-      
-      def integer_for(urn, key)
-        value_for(urn, key).to_i
-      end
-      
-      def value_for(urn, key)
-        @states.each do |state_hash|
-          if state_hash['service'] == urn
-            if state_hash['variable'] == key
-              return state_hash['value']
-            end
+      self
+    end
+    
+    private
+    
+    def set(urn, action, params, async=false, &block)
+      MiOS::Action.new(self, urn, action, params).take(async, &block)
+    end
+    
+    def timestamp_for(urn, key)
+      Time.at integer_for(urn, key)
+    end
+    
+    def boolean_for(urn, key)
+      integer_for(urn, key) == 1
+    end
+    
+    def integer_for(urn, key)
+      value_for(urn, key).to_i
+    end
+    
+    def value_for(urn, key)
+      @states.each do |state_hash|
+        if state_hash['service'] == urn
+          if state_hash['variable'] == key
+            return state_hash['value']
           end
         end
-        
-        nil
       end
       
-      def parse(data, skip_attributes=false)
+      nil
+    end
+    
+    def parse(data, skip_attributes=false)
 
-        @attributes = Hash[
-          data.select { |k, v|
-            !data[k].kind_of?(Hash) and !data[k].kind_of?(Array)
-          }.to_a
-        ] unless skip_attributes
-        
-        @states = data['states']
-        @states.map { |state|
-          state['service'].split(":").last
-        }.uniq.each { |service|
-          if MiOS::Services.const_defined?(service)
-            extend MiOS::Services.const_get(service)
-          else
-            $stderr.puts "WARNING: #{service} not yet supported"
-          end
-        }
-        
-        true
-      end
+      @attributes = Hash[
+        data.select { |k, v|
+          !data[k].kind_of?(Hash) and !data[k].kind_of?(Array)
+        }.to_a
+      ] unless skip_attributes
+      
+      @states = data['states']
+      @states.map { |state|
+        state['service'].split(":").last
+      }.uniq.each { |service|
+        if MiOS::Services.const_defined?(service)
+          extend MiOS::Services.const_get(service)
+        else
+          $stderr.puts "WARNING: #{service} not yet supported"
+        end
+      }
+      
+      true
     end
   end
 end

data/lib/mios/interface.rb

@@ -1,68 +1,56 @@
 module MiOS
   class Interface
+    attr_reader :attributes, :base_uri
 
-    class << self
-      def new(uri, *args)
-        Class.new(AbstractInterface) { |klass|
-          klass.base_uri(uri)
-        }.new(*args)
-      end
+    def initialize(base_uri)
+      @base_uri = base_uri
+      @client = HTTPClient.new
+      refresh!
     end
 
-    class AbstractInterface
-      include HTTParty
-      format :json
-
-      attr_reader :attributes
-
-      def initialize
-        refresh!
+    def method_missing(method, *args)
+      if @attributes.has_key?(method.to_s)
+        @attributes[method.to_s]
+      else
+        super
       end
+    end
 
-      def method_missing(method, *args)
-        if @attributes.has_key?(method.to_s)
-          @attributes[method.to_s]
-        else
-          super
-        end
-      end
+    def inspect
+      "#<MiOS::Interface:0x#{'%x' % (self.object_id << 1)} @base_uri=#{@base_uri} @attributes=#{@attributes.inspect}>"
+    end
 
-      def inspect
-        "#<MiOS::Interface:0x#{'%x' % (self.object_id << 1)} @attributes=#{@attributes.inspect}>"
+    def refresh!
+      data = MultiJson.load(@client.get("#{base_uri}/data_request", {:id => "user_data", :output_format => :json}).content)
+      @attributes = Hash[
+        data.select { |k, v|
+          !data[k].kind_of?(Hash) and !data[k].kind_of?(Array)
+        }.map { |k, v|
+          [k.downcase, v]
+        }
+      ]
+      # Convert some time objects
+      ['loadtime', 'devicesync'].each do |attr|
+        @attributes[attr] = Time.at(@attributes[attr].to_i)
       end
 
-      def refresh!
-        data = self.class.get "/data_request?id=user_data"
-        @attributes = Hash[
-          data.select { |k, v|
-            !data[k].kind_of?(Hash) and !data[k].kind_of?(Array)
-          }.map { |k, v|
-            [k.downcase, v]
-          }
-        ]
-        # Convert some time objects
-        ['loadtime', 'devicesync'].each do |attr|
-          @attributes[attr] = Time.at(@attributes[attr].to_i)
-        end
+      @devices = Hash[
+        data['devices'].map { |device|
+          [device['id'], Device.new(@client, @base_uri, device)]
+        }
+      ]
 
-        @devices = Hash[
-          data['devices'].map { |device|
-            [device['id'], Device.new(self.class.base_uri, device)]
-          }
-        ]
-
-        true
-      end
-
-      def categories
-        @devices.values.map { |device|
-          device.category
-        }.uniq.sort
-      end
+      true
+    end
 
-      def devices; @devices.values; end
-      
-      def device_names; devices.map(&:name); end
+    def categories
+      @devices.values.map { |device|
+        device.category
+      }.uniq.sort
     end
+
+    def devices; @devices.values; end
+    
+    def device_names; devices.map(&:name); end
   end
 end

data/lib/mios/job.rb

@@ -73,7 +73,7 @@ module MiOS
     end
     
     def reload_status!
-      @status = @obj.class.get("/data_request?id=jobstatus&job=#{@id}&plugin=zwave")['status']
+      @status = MultiJson.load(@obj.client.get("#{@obj.base_uri}/data_request", {:id => 'jobstatus', :job => @id, :plugin => 'zwave', :output_format => :json}).content)['status']
     end
   end
 end

data/lib/mios/version.rb

@@ -1,3 +1,3 @@
 module MiOS
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/mios.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "httparty", ">= 0.9.0"
+  gem.add_dependency "httpclient", ">= 2.2.0"
+  gem.add_dependency "multi_json", ">= 1.3.0"
   
   gem.add_development_dependency "rspec", ">= 2.8.0"
   gem.add_development_dependency "syntax"

metadata

@@ -1,103 +1,127 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mios
-version: !ruby/object:Gem::Version
-  version: 0.1.1
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
-authors:
+authors: 
 - Kelley Reynolds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2012-11-30 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: httpclient
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
+        version: 2.2.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: multi_json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.8.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
         version: 2.8.0
-- !ruby/object:Gem::Dependency
-  name: syntax
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: syntax
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.2
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.7.2
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: yard
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 7
+        - 2
         version: 0.7.2
+  type: :development
+  version_requirements: *id006
 description: Object-oriented interactions with MiOS from MiCasaVerde
-email:
+email: 
 - kelley.reynolds@rubyscale.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -127,37 +151,40 @@ files:
 - mios.gemspec
 - spec/random_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+has_rdoc: true
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 770704339145567336
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 770704339145567336
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Object-oriented interactions with MiOS from MiCasaVerde
-test_files:
+test_files: 
 - spec/random_spec.rb
 - spec/spec_helper.rb
-has_rdoc: