cs 0.1.0beta3 → 0.1.0

data/spec/spec_helper.rb

@@ -1,40 +1,20 @@
 require 'bundler/setup'
 require 'rspec'
-require 'commonsense-ruby-lib'
-#require 'vcr'
+require 'cs'
 require 'pry'
 
 Dir[File.join(File.dirname(__FILE__),("support/**/*.rb"))].each {|f| require f}
 
-CONFIG = YAML.load(File.read(File.expand_path("support/spec_config.yml", File.dirname(__FILE__))))
-
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
-
-  # create a single user
-  config.before(:all) do
-      unless $user
-        $username = "user#{Time.now.to_f}@tester.com"
-        $password = "password"
-
-        client = CommonSense::Client.new(base_uri: ENV['spec_base_uri'])
-        $user = client.new_user
-        $user.username = $username
-        $user.email = $user.username
-        $user.password = 'password'
-        $user.name = 'Jan'
-        $user.surname = 'jagger'
-        $user.address = 'Lloydstraat 5'
-        $user.zipcode = '3024ea'
-        $user.country = 'NETHERLANDS'
-        $user.mobile = '123456789'
-        $user.save
-      end
-  end
 end
 
 def create_client
-  CommonSense::Client.new(base_uri: ENV['spec_base_uri'])
+  CS::Client.new(base_uri: ENV['spec_base_uri'])
 end
 
 ENV['spec_base_uri'] ||= 'http://api.dev.sense-os.local'
+
+def base_uri
+  ENV['spec_base_uri']
+end

metadata

@@ -1,96 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: cs
 version: !ruby/object:Gem::Version
-  version: 0.1.0beta3
-  prerelease: 5
+  version: 0.1.0
 platform: ruby
 authors:
 - Ahmy Yulrizka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.13.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: '0.4'
 description: CommonSense API client library
 email:
 - ahmy@sense-os.nl
@@ -99,76 +60,98 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - cs.gemspec
-- lib/commonsense-ruby-lib.rb
-- lib/commonsense-ruby-lib/auth/http.rb
-- lib/commonsense-ruby-lib/auth/oauth.rb
-- lib/commonsense-ruby-lib/end_point.rb
-- lib/commonsense-ruby-lib/end_point/group.rb
-- lib/commonsense-ruby-lib/end_point/sensor.rb
-- lib/commonsense-ruby-lib/end_point/sensor_data.rb
-- lib/commonsense-ruby-lib/end_point/user.rb
-- lib/commonsense-ruby-lib/error.rb
-- lib/commonsense-ruby-lib/relation.rb
-- lib/commonsense-ruby-lib/relation/sensor_data_relation.rb
-- lib/commonsense-ruby-lib/relation/sensor_relation.rb
-- lib/commonsense-ruby-lib/serializer.rb
-- lib/commonsense-ruby-lib/session.rb
-- lib/commonsense-ruby-lib/version.rb
+- lib/cs.rb
+- lib/cs/auth/http.rb
+- lib/cs/auth/oauth.rb
+- lib/cs/collection.rb
+- lib/cs/collection/sensor_data_collection.rb
+- lib/cs/end_point.rb
+- lib/cs/end_point/group.rb
+- lib/cs/end_point/notification.rb
+- lib/cs/end_point/sensor.rb
+- lib/cs/end_point/sensor_data.rb
+- lib/cs/end_point/trigger.rb
+- lib/cs/end_point/user.rb
+- lib/cs/error.rb
+- lib/cs/parameter_processor.rb
+- lib/cs/relation.rb
+- lib/cs/relation/group_relation.rb
+- lib/cs/relation/notification_relation.rb
+- lib/cs/relation/sensor_data_relation.rb
+- lib/cs/relation/sensor_relation.rb
+- lib/cs/relation/trigger_relation.rb
+- lib/cs/relation/user_relation.rb
+- lib/cs/serializer.rb
+- lib/cs/session.rb
+- lib/cs/time.rb
+- lib/cs/version.rb
 - spec/features/sensor_data_management_spec.rb
 - spec/features/sensor_management_spec.rb
 - spec/features/user_management_spec.rb
-- spec/lib/commonsense-ruby-lib/end_point/sensor_data_spec.rb
-- spec/lib/commonsense-ruby-lib/end_point/sensor_spec.rb
-- spec/lib/commonsense-ruby-lib/end_point/user_spec.rb
-- spec/lib/commonsense-ruby-lib/end_point_spec.rb
-- spec/lib/commonsense-ruby-lib/relation/sensor_data_relation_spec.rb
-- spec/lib/commonsense-ruby-lib/relation/sensor_relation_spec.rb
-- spec/lib/commonsense-ruby-lib/session_spec.rb
-- spec/lib/commonsense-ruby-lib_spec.rb
+- spec/lib/cs/collection/sensor_data_collection_spec.rb
+- spec/lib/cs/end_point/group_spec.rb
+- spec/lib/cs/end_point/sensor_data_spec.rb
+- spec/lib/cs/end_point/sensor_spec.rb
+- spec/lib/cs/end_point/user_spec.rb
+- spec/lib/cs/end_point_spec.rb
+- spec/lib/cs/relation/group_relation_spec.rb
+- spec/lib/cs/relation/sensor_data_relation_spec.rb
+- spec/lib/cs/relation/sensor_relation_spec.rb
+- spec/lib/cs/relation/user_relation_spec.rb
+- spec/lib/cs/relation_spec.rb
+- spec/lib/cs/session_spec.rb
+- spec/lib/cs/time_spec.rb
+- spec/lib/cs_spec.rb
 - spec/spec_helper.rb
 - spec/support/spec_config.yml.sample
 - spec/support/vcr.rb
 homepage: https://github.com/senseobservationsystems/commonsense-ruby-lib
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client library to communicate with CommonSense written in ruby
 test_files:
 - spec/features/sensor_data_management_spec.rb
 - spec/features/sensor_management_spec.rb
 - spec/features/user_management_spec.rb
-- spec/lib/commonsense-ruby-lib/end_point/sensor_data_spec.rb
-- spec/lib/commonsense-ruby-lib/end_point/sensor_spec.rb
-- spec/lib/commonsense-ruby-lib/end_point/user_spec.rb
-- spec/lib/commonsense-ruby-lib/end_point_spec.rb
-- spec/lib/commonsense-ruby-lib/relation/sensor_data_relation_spec.rb
-- spec/lib/commonsense-ruby-lib/relation/sensor_relation_spec.rb
-- spec/lib/commonsense-ruby-lib/session_spec.rb
-- spec/lib/commonsense-ruby-lib_spec.rb
+- spec/lib/cs/collection/sensor_data_collection_spec.rb
+- spec/lib/cs/end_point/group_spec.rb
+- spec/lib/cs/end_point/sensor_data_spec.rb
+- spec/lib/cs/end_point/sensor_spec.rb
+- spec/lib/cs/end_point/user_spec.rb
+- spec/lib/cs/end_point_spec.rb
+- spec/lib/cs/relation/group_relation_spec.rb
+- spec/lib/cs/relation/sensor_data_relation_spec.rb
+- spec/lib/cs/relation/sensor_relation_spec.rb
+- spec/lib/cs/relation/user_relation_spec.rb
+- spec/lib/cs/relation_spec.rb
+- spec/lib/cs/session_spec.rb
+- spec/lib/cs/time_spec.rb
+- spec/lib/cs_spec.rb
 - spec/spec_helper.rb
 - spec/support/spec_config.yml.sample
 - spec/support/vcr.rb

data/lib/commonsense-ruby-lib/end_point/group.rb

@@ -1,28 +0,0 @@
-module CommonSense
-  module EndPoint
-    class Group
-      include EndPoint
-
-      attr_accessor :id, :name, :description, :public
-      # get groups that user belongs to
-      def current_groups(options={})
-        res = session.get("/groups.json", options)
-        return nil unless res
-
-        group_list = res['groups']
-
-
-        groups =[]
-        if group_list
-          group_list.each do |group|
-            g = Group.new(group)
-            g.session = session
-            groups << g
-          end
-        end
-
-        groups
-      end
-    end
-  end
-end

data/lib/commonsense-ruby-lib/relation.rb

@@ -1,233 +0,0 @@
-module CommonSense
-  module Relation
-    module Boolean; end
-
-    def check_session!
-      raise Error::SessionEmptyError unless @session
-    end
-
-    def get_url
-      raise Error::NotImplementedError, "the class #{self.class} does not respond to 'get_url' "
-    end
-
-    def get_data!(params={})
-      check_session!
-      options = get_options(params)
-      session.get(get_url, options)
-    end
-
-    def parameter(name)
-      self.instance_variable_get("@#{name}")
-    end
-
-    def get_options(params)
-      options = {}
-
-      params.each do |k,v|
-        param_option = self.class.parameters[k]
-
-        value = v
-        value = process_param_integer(k, v, param_option) if param_option[:type] == Integer
-        value = process_param_boolean(k, v, param_option) if param_option[:type] == Boolean
-        value = process_param_string(k, v, param_option) if param_option[:type] == String
-
-        if value.kind_of?(Time)
-          value = value.to_f
-        end
-
-        options[k] = value
-      end
-
-      options
-    end
-
-    def get_data(params={})
-      get_data!(params) rescue nil
-    end
-
-    def all
-      self.to_a
-    end
-
-    def count
-      check_session!
-      resource = get_single_resource
-      resource["total"] if resource
-    end
-
-    def first
-      resource = get_single_resource
-      parse_single_resource(resource)
-    end
-
-    def last
-      total = count
-      resource = get_single_resource(page: count - 1)
-      parse_single_resource(resource)
-    end
-
-    def inspect
-      inspection = self.class.parameters.collect {|k,v| "#{k}: #{parameter(k).inspect}"}.compact.join(", ")
-      "#<#{self.class} #{inspection}>"
-    end
-
-    def where(params={})
-      process_alias!(params)
-      params.keep_if {|k| self.class.parameters[k]}
-
-      params.each do |k,v|
-        param_option = self.class.parameters[k]
-
-        value = process_param_integer(k, v, param_option) if param_option[:type] == Integer
-        value = process_param_boolean(k, v, param_option) if param_option[:type] == Boolean
-        value = process_param_string(k, v, param_option) if param_option[:type] == String
-        value = process_param_time(k, v, param_option) if param_option[:type] == Time
-
-        self.send("#{k}=", value)
-      end
-
-      self
-    end
-
-    module ClassMethod
-      def parameter(name, type, *args)
-        attr_accessor name
-        self.parameters ||= {}
-
-        param = {type: type}
-        unless args.empty?
-          param.merge!(args[0])
-        end
-
-        self.parameters[name] = param
-      end
-
-      def parameter_alias(name, name_alias)
-        attr_accessor name
-        self.parameters_alias ||= {}
-        self.parameters_alias[name] = name_alias
-      end
-
-      def parameters_alias=(parameters_alias)
-        @parameters_alias = parameters_alias
-      end
-
-      def parameters_alias
-        @parameters_alias
-      end      
-
-      def parameters=(parameters)
-        @parameters = parameters
-      end
-
-      def parameters
-        @parameters
-      end
-    end
-
-    protected
-    def self.included(base)
-      base.send(:include, Enumerable)
-      base.extend(ClassMethod)
-      base.class_eval do
-        attr_accessor :session
-      end
-    end
-
-    def parse_single_resource(resource)
-      raise Error::NotImplementedError, "parse_single_resource is not implemented for class : #{self.class}"
-    end
-
-    def get_single_resource(params={})
-      raise Error::NotImplementedError, "get_single_resource is not implemented for class : #{self.class}"
-    end
-
-    def process_alias!(params)
-      return if self.class.parameters_alias.nil?
-
-      aliases = params.select { |param| self.class.parameters_alias.include?(param) }
-      aliases.each do |alias_to, value|
-        alias_for = self.class.parameters_alias[alias_to]
-        params[alias_for] = value
-        params.delete(alias_to)
-      end
-    end
-
-
-    def process_valid_values(name, value, param_option)
-      return value unless param_option[:valid_values]
-
-      if param_option[:valid_values].include?(value)
-        value
-      elsif !value.nil?
-        raise ArgumentError, "Invalid value for parameter '#{name}'"
-      end
-
-    end
-
-    def process_default_value(name, value, param_option)
-      value.nil? ? param_option[:default] : value
-    end
-
-    def process_param_integer(name, value, param_option)
-      if value.kind_of?(Integer)
-        retval = value
-        retval = process_valid_values(name, value, param_option) if param_option[:valid_values]
-      end
-
-      retval = process_default_value(name, retval, param_option)
-
-      if !value.nil?  && !value.kind_of?(Integer)
-        raise ArgumentError, "Received non Integer value for parameter '#{name}'"
-      end
-
-      retval
-    end
-
-    def process_param_boolean(name, value, param_option)
-      retval = nil
-
-      if value.nil?
-        retval = param_option[:default] ? param_option[:default] : nil
-      elsif [0, "0", false, "false"].include?(value)
-        retval = 0
-      else
-        retval = 1
-      end
-
-      retval
-    end
-
-    def process_param_string(name, value, param_option)
-      retval = value
-      retval = process_valid_values(name, value, param_option) if param_option[:valid_values]
-      retval = process_default_value(name, retval, param_option)
-
-      retval
-    end
-
-    # This method prosess assignment for properties with datatype Time.
-    # There are 3 type that is valid for this properties:
-    #
-    # * **Time**
-    # * **Numeric**. It will convert this to ruby {Time}
-    # * **Obejct that respond to #to_time** and return ruby {Time}
-    #
-    def process_param_time(name, value, param_option)
-      retval = value
-
-      if !value.nil? && !value.kind_of?(Time)
-        if value.kind_of?(Numeric)
-          retval = Time.at(retval)
-        else
-          retval = value.to_time
-        end
-      end
-
-      retval = process_default_value(name, retval, param_option)
-      retval = process_valid_values(name, value, param_option) if param_option[:valid_values]
-
-      retval
-    end
-  end
-end