machineshop 0.0.4 → 1.0.0

data/spec/lib/device_spec.rb

@@ -1,10 +1,20 @@
 require_relative '../spec_helper'
 
+#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
+MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
+
 #publisher_username = 'publisher@machineshop.com'
 publisher_username = 'admin@csr.com'
 publisher_password = 'password'
 
-
+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
   auth_token, user = MachineShop::User.authenticate(
       :email => publisher_username,
       :password => publisher_password
@@ -20,8 +30,6 @@ describe MachineShop::Device do
          :per_page => 10},
         auth_token)
 
-    ap "listing all devices"
-    puts element_data
     device = element_data[0]
     device.should_not be_nil
     device.should be_kind_of MachineShop::Device
@@ -31,10 +39,8 @@ specificDevice = nil
 
 
   it "should get a device for the user by id" do
-    specificDevice = MachineShop::Device.retrieve(device.id, auth_token)
+    specificDevice = MachineShop::Device.retrieve(device[:id], auth_token)
 
-    ap "Device by id"
-    ap specificDevice.as_json
     specificDevice.should_not be_nil
     specificDevice.should be_kind_of MachineShop::Device
   end
@@ -44,8 +50,6 @@ specificDevice = nil
   it "should delete device" do
     delete = specificDevice.delete
 
-    ap "Delete Device by id"
-    ap delete.as_json
     delete.http_code.should eq 200
   end
 
@@ -88,8 +92,6 @@ describe MachineShop::DeviceInstance do
         },
         auth_token)
 
-    ap "device created:"
-    ap device.as_json
 
     # Now create an instance
     device_instance = device.create_instance(
@@ -99,9 +101,6 @@ describe MachineShop::DeviceInstance do
         }
     )
 
-    ap "creating device instance"
-    ap device_instance.as_json
-
     device_instance.should_not be_nil
     device_instance.should be_kind_of MachineShop::DeviceInstance
   end
@@ -110,10 +109,6 @@ describe MachineShop::DeviceInstance do
   it "should get device instances" do
     element_data = MachineShop::DeviceInstance.all({}, auth_token)
 
-    ap "getting all device instances"
-
-    ap device_instance.as_json
-
     device_instance = element_data[0]
     element_data.should_not be_nil
     element_data.should_not be_empty
@@ -123,10 +118,7 @@ describe MachineShop::DeviceInstance do
 
 
   it "should get a device instance by id" do
-    element_data = MachineShop::DeviceInstance.retrieve(device_instance.id, auth_token)
-
-    ap "Device Instance by id: "
-    ap element_data.as_json
+    element_data = MachineShop::DeviceInstance.retrieve("5395835f385f7f53ec000160", auth_token)
 
     element_data.should_not be_nil
     element_data.should be_kind_of MachineShop::DeviceInstance
@@ -135,9 +127,6 @@ describe MachineShop::DeviceInstance do
   it "should get a device instance by name" do
     element_data = MachineShop::DeviceInstance.all({:name => device_instance.name}, auth_token)
 
-    ap "Device Instance by name: "
-    ap element_data.as_json
-
     element_data.should_not be_nil
     element_data.should_not be_empty
   end
@@ -145,9 +134,6 @@ describe MachineShop::DeviceInstance do
   it "should get all devices via a user" do
     element_data = user.device_instances
 
-    ap "Device Instance via user "
-    ap element_data.as_json
-
     element_data.should_not be_nil
     element_data.should_not be_empty
   end

data/spec/lib/mapping_spec.rb

@@ -1,5 +1,8 @@
 require_relative '../spec_helper'
 
+#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
+MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
+
 #publisher_username = 'publisher@machineshop.com'
 publisher_username = 'admin@csr.com'
 publisher_password = 'password'
@@ -13,7 +16,6 @@ publisher_password = 'password'
 describe MachineShop::Mapping do
 
    it "should get a geocoded address" do
-    ap "geocoding address"
     element_data = MachineShop::Mapping.geocode(
         {
             :address => "1600 Amphitheatre Parkway, Mountain View, CA",
@@ -21,15 +23,11 @@ describe MachineShop::Mapping do
         },
         auth_token)
 
-ap element_data.as_json
-    #puts "GEO: #{element_data}"
-
     element_data.should_not be_nil
     element_data.should_not be_empty
   end
 
   it "should get directions" do
-    ap "getting directions"
     element_data = MachineShop::Mapping.directions(
         {
             :origin => "Denver",
@@ -37,15 +35,12 @@ ap element_data.as_json
             :sensor => "false"
         },
         auth_token)
-# ap element_data.as_json
-    #puts "GEO: #{element_data}"
 
     element_data.should_not be_nil
     element_data.should_not be_empty
   end
 
   it "should get distance" do
-    ap "getting distance "
     element_data = MachineShop::Mapping.distance(
         {
             :origins => "Vancouver BC",
@@ -55,9 +50,6 @@ ap element_data.as_json
             :sensor => "false"
         },
         auth_token)
-ap element_data.as_json
-    #puts "GEO: #{element_data}"
-
     element_data.should_not be_nil
     element_data.should_not be_empty
   end

data/spec/lib/meter_spec.rb

@@ -1,5 +1,8 @@
 require_relative '../spec_helper'
 
+#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
+MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
+
 #publisher_username = 'publisher@machineshop.com'
 publisher_username = 'admin@csr.com'
 publisher_password = 'password'
@@ -16,8 +19,6 @@ 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
@@ -25,20 +26,14 @@ 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

@@ -1,5 +1,7 @@
 require_relative '../spec_helper'
 
+#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
+MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
 
 #publisher_username = 'publisher@machineshop.com'
 publisher_username = 'publisher@csr.com'
@@ -17,10 +19,6 @@ describe MachineShop::Report do
     it "should get all report data" do
     element_data = MachineShop::Report.all({}, auth_token)
 reports=element_data
-
-puts "yaaaaaaaaaaaaaaaaaaaaa"
-    puts "element_data: #{element_data}"
-
     element_data.should_not be_nil
     element_data.should_not be_empty
   end
@@ -34,8 +32,6 @@ puts "yaaaaaaaaaaaaaaaaaaaaa"
           #: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
 
@@ -43,8 +39,6 @@ puts "yaaaaaaaaaaaaaaaaaaaaa"
     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

@@ -1,76 +1,71 @@
 require_relative '../spec_helper'
 
+#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
+MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
+
+#publisher_username = 'publisher@machineshop.com'
 publisher_username = 'admin@csr.com'
 publisher_password = 'password'
 
+MachineShop.configure do |config|
+  config.db_name = "machineshop"
+  config.db_username="root"
+  config.db_password="root"
+  config.db_host= "localhost"
+  config.expiry_time= lambda{10.seconds.ago}
+  #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"
-    puts 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"
-
-              }]
-          },
-          :then_actions=>[{
-              :priority=>"1",
-              :send_to=>"abc@me.com",
-              :type=>"email_rule_action"
+        :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"
+        }]
       }
-  }
+    }
 
-    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
@@ -78,15 +73,12 @@ ap createdRule.as_json
   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
@@ -94,9 +86,6 @@ ap createdRule.as_json
 
   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
-    puts test_data
     test_data.should_not be_nil
 
   end
@@ -104,18 +93,14 @@ ap createdRule.as_json
 
   it "should get rule by device_id" do
     test_data = MachineShop::Rule.get_by_device_instance(auth_token,'52585e1d981800bab2000478')
-    ap "rule by_device_instance :"
-    puts test_data
-    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/test_spec.rb

@@ -0,0 +1,47 @@
+require_relative '../spec_helper'
+
+#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
+MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
+
+publisher_username = 'admin@csr.com'
+publisher_password = 'password'
+
+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
+
+auth_token, user = MachineShop::User.authenticate(
+:email => publisher_username,
+:password => publisher_password
+)
+
+describe MachineShop::Device do
+
+  device = nil
+
+  it "should get all devices for the user" do
+
+
+
+    element_data = MachineShop::Device.all(
+    {:page => 1,
+      :per_page => 10,
+      :name=>"my_device"
+    },
+    auth_token)
+
+    device = element_data[0]
+    device.should_not be_nil
+    device.should be_kind_of MachineShop::Device
+
+  end
+end
+
+
+
+

data/spec/lib/user_spec.rb

@@ -1,6 +1,10 @@
 require_relative '../spec_helper'
 
 
+#MachineShop.api_base_url= 'http://machineshop.dev:3000/api/v0'
+MachineShop.api_base_url= 'http://stage.services.machineshop.io/api/v0'
+
+#publisher_username = 'publisher@machineshop.com'
 publisher_username = 'admin@csr.com'
 publisher_password = 'password'
 
@@ -15,8 +19,6 @@ 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
@@ -25,17 +27,11 @@ 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
@@ -43,9 +39,6 @@ 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