flowthings 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaeab445dade8459cd6b0ed1053b9e7bf7e0cd6e
-  data.tar.gz: dd7c921672c1308d472694cd70a8f297390b94a8
+  metadata.gz: 04e66aab7534d9228bf1544aa872899bc69e3f27
+  data.tar.gz: 36a659f2b378c452339156f8dcc9a03803e18bd7
 SHA512:
-  metadata.gz: d0405b2e6c30d7311a40da5ca5311f8b0028ed808075141a21c4a22082cca9eca80bed49a310d3f5de09c7ad1e2ef4f25b9c6c1d563f8f64a576692228a189f3
-  data.tar.gz: c8af059a5468092148916ee217252d7ac3102847f3e3f183c2e99935112b5c980d2f3711485eec8a9d59b4b07e6a867ba7e66574c349c6279cc5048468f79bba
+  metadata.gz: 9b5e7cb12d9e63ad180491756a2a497787edcc3022291d696abb42994aceb7119bf87dae30828bd6098aea1a01b49ece4690119b647184d9603887fa6ab337b6
+  data.tar.gz: 8d3ed91dfcce1b1aa697725488a28909986043d326ebb464c8cc396c918f6264e0d1aac4f2a6ddf562e9ac50889fff405e2060b05f9ff3f9885557ae0bf1982a

data/lib/flowthings/client.rb

@@ -16,10 +16,10 @@ module Flowthings
 
     def initialize(options={})
       @services = [ApiTask, Drop, Flow, Group, Identity, Mqtt, Share, Token, Track]
-      merged_options = Flowthings.options.merge(options)
+      merged_options = Flowthings.options.merge options
 
       Configuration::VALID_CONFIG_KEYS.each do |key|
-        send("#{key}=", merged_options[key])
+        send "#{key}=", merged_options[key]
       end
 
       service_factory
@@ -29,7 +29,7 @@ module Flowthings
     def get_options
       opts = {}
       Configuration::VALID_CONFIG_KEYS.each do |key|
-        opts[key.to_sym] = send("#{key}")
+        opts[key.to_sym] = send "#{key}"
       end
 
       opts
@@ -42,13 +42,13 @@ module Flowthings
         service_name = service.name.underscore.split("/")[1]
 
         if service_name == "drop"
-          instance_eval(<<-EOS)
+          instance_eval <<-EOS
             def #{service_name}(flowId)
               #{service}.new flowId, connection, get_options
             end
           EOS
         else
-          instance_eval(<<-EOS)
+          instance_eval <<-EOS
             def #{service_name}
               #{service}.new connection, get_options
             end

data/lib/flowthings/crud/aggregate.rb

@@ -6,11 +6,11 @@ module Flowthings
       include Flowthings::CrudUtils
 
       def aggregate(data, params={})
-        path = mk_path({tail: "aggregate"})
-        params = mk_params(params)
-        data = mk_data(data)
+        path = mk_path tail: "aggregate"
+        params = mk_params params
+        data = mk_data data
 
-        platform_post(path, params=params, data=data)
+        platform_post path, params=params, data=data
       end
 
     end

data/lib/flowthings/crud/base.rb

@@ -7,32 +7,32 @@ module Flowthings
 
       def create(data, params={})
         path = mk_path
-        params = mk_params(params)
-        data = mk_data(data)
+        params = mk_params params
+        data = mk_data data
 
-        platform_post(path, params=params, data=data)
+        platform_post path, params=params, data=data
       end
 
       def read(id, params={})
-        path = mk_path({id: id})
-        params = mk_params(params)
+        path = mk_path id: id
+        params = mk_params params
 
-        platform_get(path, params=params)
+        platform_get path, params=params
       end
 
       def update(id, data, params={})
-        path = mk_path(id: id)
-        params = mk_params(params)
-        data = mk_data(data)
+        path = mk_path id: id
+        params = mk_params params
+        data = mk_data data
 
-        platform_put(path, params=params, data=data)
+        platform_put path, params=params, data=data
       end
 
       def destroy(id, params={})
-        path = mk_path({id: id})
-        params = mk_params(params)
+        path = mk_path id: id
+        params = mk_params params
 
-        platform_delete(path, params=params)
+        platform_delete path, params=params
       end
 
       alias_method :delete, :destroy

data/lib/flowthings/crud/extended_methods.rb

@@ -1,12 +1,16 @@
+require 'flowthings/utils/crud_utils'
+
 module Flowthings
   module Crud
     module ExtendedMethods
+      include Flowthings::CrudUtils
+
       def delete_all(params={})
       end
 
       def find_many(filters={}, params={})
         path = mk_path
-        params = mk_params(params)
+        params = mk_params params
         data = []
 
         @flowIds.each do flowId
@@ -19,7 +23,7 @@ module Flowthings
         end
 
 
-        platform_mget(path, params=params, data=data)
+        platform_mget path, params=params, data=data
       end
     end
   end

data/lib/flowthings/crud/find.rb

@@ -1,12 +1,16 @@
+require 'flowthings/utils/crud_utils'
+
 module Flowthings
   module Crud
     module Find
+      include Flowthings::CrudUtils
+
       def find(params={})
         path_params = {}
-        path = mk_path(path_params)
-        params = mk_params(params)
+        path = mk_path path_params
+        params = mk_params params
 
-        platform_get(path, params=params)
+        platform_get path, params=params
       end
     end
   end

data/lib/flowthings/crud/member_update.rb

@@ -1,13 +1,16 @@
+require 'flowthings/utils/crud_utils'
+
 module Flowthings
   module Crud
     module MemberUpdate
-      def member_update(id, member_name, data, params)
-        path = mk_path({tail: member_name,
-                        id: id})
-        params = mk_params(params)
-        data = mk_data(data)
+      include Flowthings::CrudUtils
+
+      def member_update(id, member_name, data, params={})
+        path = mk_path tail: member_name, id: id
+        params = mk_params params
+        data = mk_data data
 
-        platform_put(path, params=params, data=data)
+        platform_put path, params=params, data=data
       end
     end
   end

data/lib/flowthings/crud/simulate.rb

@@ -1,12 +1,16 @@
+require 'flowthings/utils/crud_utils'
+
 module Flowthings
   module Crud
     module Simulate
+      include Flowthings::CrudUtils
+
       def simulate(data, params={})
-        path = mk_path({tail: "simulate"})
-        params = mk_params(params)
-        data = mk_data(data)
+        path = mk_path tail: "simulate"
+        params = mk_params params
+        data = mk_data data
 
-        platform_post(path, params=params, data=data)
+        platform_post path, params=params, data=data
       end
     end
   end

data/lib/flowthings/platform_objects/platform_object_interface.rb

@@ -22,7 +22,7 @@ module Flowthings
       check_platform_object
 
       Configuration::VALID_CONFIG_KEYS.each do |key|
-        instance_variable_set("@#{key}", options[key])
+        instance_variable_set "@#{key}", options[key]
       end
 
       @connection = connection

data/lib/flowthings/request.rb

@@ -11,23 +11,23 @@ module Flowthings
     private
 
     def platform_get(path, params={}, options={})
-      request(:get, path, params, options)
+      request :get, path, params, options
     end
 
     def platform_post(path, data, params={}, options={})
-      request(:post, path, params, options, data=data)
+      request :post, path, params, options, data=data
     end
 
     def platform_put(path, data, params={}, options={})
-      request(:put, path, params, options, data=data)
+      request :put, path, params, options, data=data
     end
 
     def platform_mget(path, data, params={}, options={})
-      request(:mget, path, params, options, data=data)
+      request :mget, path, params, options, data=data
     end
 
     def platform_delete(path, params={}, options={})
-      request(:delete, path, params, options)
+      request :delete, path, params, options
     end
 
     def request(method, path, params, options, data={})
@@ -39,15 +39,14 @@ module Flowthings
                         method: method.to_sym)
       when :post, :put, :mget
         body = params unless params.empty?
-        body = JSON.generate(body)
+        body = JSON.generate body
         response = @connection.request(path: path,
                         query: params,
                         method: method.to_sym,
                         body: body)
       end
 
-      raise_error(response)
-
+      raise_error response
 
       response = response.data
 

data/lib/flowthings/utils/crud_utils.rb

@@ -38,7 +38,7 @@ module Flowthings
     end
 
     def mk_regex()
-
+      # This is a feature we will implement, a better regex dsl
     end
 
     def mk_params(params = {})

data/lib/flowthings/version.rb

@@ -1,3 +1,3 @@
 module Flowthings
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/platform_objects/drop_spec.rb

@@ -67,11 +67,6 @@ describe Flowthings::Drop do
                         }
                       }
                      }
-
-      @aggregation = {
-        "filter": "EXISTS elem_name",
-        "output": ["$count"]
-      }
     end
 
     after(:example) do
@@ -119,8 +114,8 @@ describe Flowthings::Drop do
       @api.drop(@flowId).create(@drop)
 
       @aggregation = {
-        "filter": "EXISTS elem_name",
-        "output": ["$count"]
+        "filter" => "EXISTS elem_name",
+        "output" => ["$count"]
       }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flowthings
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Greg Meyer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport