lib/lelylan/client.rb in lelylan-rb-0.0.1 vs lib/lelylan/client.rb in lelylan-rb-0.0.2

@@ -1,18 +1,19 @@
 require 'lelylan/authentication'
 require 'lelylan/connection'
 require 'lelylan/request'
 
-require 'lelylan/client/devices'
-require 'lelylan/client/consumptions'
-require 'lelylan/client/histories'
-require 'lelylan/client/types'
-require 'lelylan/client/properties'
-require 'lelylan/client/functions'
-require 'lelylan/client/statuses'
-require 'lelylan/client/categories'
-require 'lelylan/client/locations'
+require 'lelylan/client/profile'
+require 'lelylan/client/device'
+require 'lelylan/client/history'
+require 'lelylan/client/type'
+require 'lelylan/client/property'
+require 'lelylan/client/function'
+require 'lelylan/client/status'
+require 'lelylan/client/location'
+require 'lelylan/client/subscription'
+require 'lelylan/client/physical'
 
 module Lelylan
   class Client
     attr_accessor(*Configuration::VALID_OPTIONS_KEYS)
 
@@ -21,27 +22,23 @@
       Configuration::VALID_OPTIONS_KEYS.each do |key|
         send("#{key}=", options[key])
       end
     end
 
-    # helper method
-    def find_id(uri)
-      Addressable::URI.parse(uri).basename
-    end
-
     # structure related
     include Lelylan::Authentication
     include Lelylan::Connection
     include Lelylan::Request
 
     # client related
-    include Lelylan::Client::Devices
-    include Lelylan::Client::Consumptions
-    include Lelylan::Client::Histories
-    include Lelylan::Client::Types
-    include Lelylan::Client::Properties
-    include Lelylan::Client::Functions
-    include Lelylan::Client::Statuses
-    include Lelylan::Client::Categories
-    include Lelylan::Client::Locations
+    include Lelylan::Client::Profile
+    include Lelylan::Client::Device
+    include Lelylan::Client::History
+    include Lelylan::Client::Type
+    include Lelylan::Client::Property
+    include Lelylan::Client::Function
+    include Lelylan::Client::Status
+    include Lelylan::Client::Location
+    include Lelylan::Client::Subscription
+    include Lelylan::Client::Physical
   end
 end