machineshop 1.0.0 → 1.0.2

data/spec/lib/meter_spec.rb

@@ -19,6 +19,8 @@ describe MachineShop::Meter do
   it "should get all meter data" do
     element_data = MachineShop::Meter.all({}, auth_token)
 
+    puts "element_data from all: #{element_data}"
+
     element_data.should_not be_nil
     element_data.should_not be_empty
   end
@@ -26,14 +28,20 @@ describe MachineShop::Meter do
   it "should get meter by id " do
 
     meter_id = element_data[0].id
+ap "retrieving meter for id #{meter_id}"
+
+    # element_data = MachineShop::Meter.retrieve(meter_id, auth_token)
     element_data = MachineShop::Meter.retrieve(meter_id, auth_token)
+    puts "meter by id : #{element_data}"
     element_data.should_not be_nil
   end
 
   it "should get meters via a user" do
 
+    ap "meters by user "
     element_data = user.meters
 
+    puts "meters via user: #{element_data}"
     element_data.should_not be_nil
     element_data.should_not be_empty
   end

data/spec/lib/report_spec.rb

@@ -19,6 +19,8 @@ describe MachineShop::Report do
     it "should get all report data" do
     element_data = MachineShop::Report.all({}, auth_token)
 reports=element_data
+    puts "element_data: #{element_data}"
+
     element_data.should_not be_nil
     element_data.should_not be_empty
   end
@@ -32,6 +34,8 @@ reports=element_data
           #:created_at_between=>'2013-11-04T00:00:00_2014-03-19T17:02:00'
         }), auth_token)
 
+    puts "element data of f00e5981800ad58000006 #{element_data} "
+
     element_data.should_not be_nil
   end
 
@@ -39,6 +43,8 @@ reports=element_data
     specific_report_id=reports[0].id
     element_data = MachineShop::Report.retrieve("5384800dff7346390c000001",auth_token)
 
+    puts "report specific #{element_data} "
+
     element_data.should_not be_nil
   end
 

data/spec/lib/rule_spec.rb

@@ -13,59 +13,75 @@ MachineShop.configure do |config|
   config.db_password="root"
   config.db_host= "localhost"
   config.expiry_time= lambda{10.seconds.ago}
-  #second
+   #second
 end
 
-auth_token, user = MachineShop::User.authenticate(
-:email => publisher_username,
-:password => publisher_password
-)
+  auth_token, user = MachineShop::User.authenticate(
+      :email => publisher_username,
+      :password => publisher_password
+  )
 
 
 describe MachineShop::Rule do
 
   rules=nil
-
+ 
   it "should get all the rules " do
     rules = MachineShop::Rule.all({},auth_token)
+    # puts "rules haru : #{rules}"
+    # ap "getting rules"
+    # ap rules.as_json
     rules.should_not be_nil
+
+
   end
 
+
+
+ 
   it "should create rule" do
 
-    create_hash = {
+
+ create_hash = {
       :devices=>["52585e1d981800bab2000479"],
       :device_instances=>[],
       :rule=>{
-        :active=>true,
-        :description=>"bajratest",
-        :condition=>{
-          :type=>"and_rule_condition",
-          :rule_conditions=>[{
-
-            :property=>"var",
-            :value=>"30",
-            :type=>"equal_rule_condition"
-
+          :active=>true,
+          :description=>"bajratest",
+          :condition=>{
+              :type=>"and_rule_condition",
+              :rule_conditions=>[{
+
+                  :property=>"var",
+                  :value=>"30",
+                  :type=>"equal_rule_condition"
+
+              }]
+          },
+          :then_actions=>[{
+              :priority=>"1",
+              :send_to=>"abc@me.com",
+              :type=>"email_rule_action"
           }]
-        },
-        :then_actions=>[{
-          :priority=>"1",
-          :send_to=>"abc@me.com",
-          :type=>"email_rule_action"
-        }]
       }
-    }
+  }
 
+    # ap "creating rule "
     createdRule = MachineShop::Rule.create(create_hash,auth_token)
+
+# ap createdRule.as_json
+
     createdRule.should_not be_nil
 
   end
 
   specificRule = nil
-
+ 
   it "should get rule by id" do
+    # ruleById = MachineShop::Rule.retrieve(rules[0].id,auth_token)
     specificRule = MachineShop::Rule.retrieve("5395b4829818008e790000f9",auth_token)
+    # ap "retrieved rule"
+    # ap specificRule.as_json
     specificRule.should_not be_nil
 
   end
@@ -73,12 +89,15 @@ describe MachineShop::Rule do
   it "should delete rule by" do
     # ruleById = MachineShop::Rule.retrieve(rules[0].id,auth_token)
     delete = specificRule.delete
+    # ap "Deleted rule"
+    # ap delete.as_json
     delete.should_not be_nil
 
   end
 
   it "should get get join rule conditions" do
     test_data = MachineShop::Rule.get_join_rule_conditions(auth_token)
+    # puts "rule comparison : #{test_data.inspect}"
     test_data.should_not be_nil
 
   end
@@ -86,6 +105,8 @@ describe MachineShop::Rule do
 
   it "should get comparison rule_conditions" do
     test_data = MachineShop::Rule.get_comparison_rule_conditions(auth_token)
+    # ap "comparison rule condition  :"
+    # ap test_data.as_json
     test_data.should_not be_nil
 
   end
@@ -93,14 +114,17 @@ describe MachineShop::Rule do
 
   it "should get rule by device_id" do
     test_data = MachineShop::Rule.get_by_device_instance(auth_token,'52585e1d981800bab2000478')
+    # ap "rule by_device_instance :"
+    # ap test_data.as_json
     test_data.should_not be_nil
 
   end
 
   it "should get deleted rule" do
     test_data = MachineShop::Rule.get_deleted(auth_token)
+    # puts "deleted rule : #{test_data.inspect}"
     test_data.should_not be_nil
 
   end
-
+ 
 end

data/spec/lib/user_spec.rb

@@ -19,6 +19,8 @@ describe MachineShop::User do
         :password => publisher_password
     )
 
+    ap "User Data"
+    ap user.as_json
     auth_token.should_not be_nil
     user.should_not be_nil
     user.should be_kind_of MachineShop::User
@@ -27,11 +29,17 @@ describe MachineShop::User do
   it "should get all roles from a static instance" do
     element_data = MachineShop::User.all_roles(auth_token)
 
+    ap "all_roles: "
+    ap element_data.as_json
+    puts element_data
+
     element_data.should_not be_nil
   end
 
   it "should get all roles from a user instance" do
 
+    ap " here user is : "
+    ap user.as_json
     element_data = user.all_roles
     element_data.should_not be_nil
   end
@@ -39,6 +47,9 @@ describe MachineShop::User do
   it "should get a user for the user by id" do
     element_data = MachineShop::User.retrieve(user.id, auth_token)
 
+    ap "user retrieve"
+    ap element_data.as_json
+
     element_data.should_not be_nil
     element_data.should be_kind_of MachineShop::User
   end

data/spec/spec_helper.rb

@@ -1,3 +1,12 @@
 require 'machineshop'
 require "awesome_print"
-require "active_support/core_ext"
+require "active_support/core_ext"
+
+MachineShop.configure do |config|
+  config.db_name = "machineshop"
+  config.db_username="root"
+  config.db_password="root"
+  config.db_host= "localhost"
+  config.expiry_time= lambda{120.seconds.ago}
+  #second
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: machineshop
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - machineshop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -152,6 +152,7 @@ files:
 - lib/machineshop/database.rb
 - lib/machineshop/device.rb
 - lib/machineshop/device_instance.rb
+- lib/machineshop/end_points.rb
 - lib/machineshop/errors/api_connection_error.rb
 - lib/machineshop/errors/api_error.rb
 - lib/machineshop/errors/authentication_error.rb
@@ -164,8 +165,8 @@ files:
 - lib/machineshop/machineshop_object.rb
 - lib/machineshop/mapping.rb
 - lib/machineshop/meter.rb
+- lib/machineshop/models/api_endpoint.rb
 - lib/machineshop/models/api_request.rb
-- lib/machineshop/models/people.rb
 - lib/machineshop/models/schema.rb
 - lib/machineshop/report.rb
 - lib/machineshop/rule.rb
@@ -175,17 +176,20 @@ files:
 - lib/machineshop/utility.rb
 - lib/machineshop/version.rb
 - machineshop.gemspec
+- spec/lib/api_calls_spec.rb
+- spec/lib/custom_endpoint_test.rb
 - spec/lib/customer_spec.rb
 - spec/lib/data_source.rb
 - spec/lib/data_source_type_spec.rb
 - spec/lib/database_spec.rb
 - spec/lib/device_instances.rb
 - spec/lib/device_spec.rb
+- spec/lib/endpoint_spec.rb
+- spec/lib/geocode_spec
 - spec/lib/mapping_spec.rb
 - spec/lib/meter_spec.rb
 - spec/lib/report_spec.rb
 - spec/lib/rule_spec.rb
-- spec/lib/test_spec.rb
 - spec/lib/user_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -213,16 +217,19 @@ signing_key:
 specification_version: 4
 summary: A convenient way to call into the machineshop API.
 test_files:
+- spec/lib/api_calls_spec.rb
+- spec/lib/custom_endpoint_test.rb
 - spec/lib/customer_spec.rb
 - spec/lib/data_source.rb
 - spec/lib/data_source_type_spec.rb
 - spec/lib/database_spec.rb
 - spec/lib/device_instances.rb
 - spec/lib/device_spec.rb
+- spec/lib/endpoint_spec.rb
+- spec/lib/geocode_spec
 - spec/lib/mapping_spec.rb
 - spec/lib/meter_spec.rb
 - spec/lib/report_spec.rb
 - spec/lib/rule_spec.rb
-- spec/lib/test_spec.rb
 - spec/lib/user_spec.rb
 - spec/spec_helper.rb

data/lib/machineshop/models/people.rb

@@ -1,13 +0,0 @@
-	# require 'active_record'
-
-	# require 'machineshop/database'
-
-	# Database.new
-	# module MachineShop
-
-	class People < ActiveRecord::Base
-		# end
-
-	end
-
-# end