restpack-core-client 0.1.1 → 0.1.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Gavin Joyce and RESTpack contributors
+Copyright (c) 2013 Gavin Joyce and RestPack contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/lib/restpack-core-client/api.rb

@@ -1,3 +1,8 @@
+require_relative 'models/channel'
+require_relative 'models/application'
+require_relative 'models/domain'
+require_relative 'models/configuration'
+
 module RestPack
   module Core
     module Client
@@ -10,7 +15,9 @@ module RestPack
         def get_channel(id)   
           p "API.get_channel(#{id})"
           json = RestClient.get("http://:#{@password}@#{@domain}/api/v1/channels/#{id}.json")
-          JSON.parse(json, :symbolize_keys => true)
+          data = JSON.parse(json, :symbolize_keys => true)
+          
+          hydrate_channel(data)
         end
         
         def get_domain(identifier)
@@ -19,6 +26,24 @@ module RestPack
           result = JSON.parse(json, :symbolize_keys => true)
           result[:domains].first
         end
+        
+        def hydrate_channel(channel_response)
+          channel = Channel.new(channel_response)
+          
+          channel_response[:applications].each do |application_data|
+            Application.new(application_data, channel)
+          end
+          
+          channel_response[:domains].each do |domain_data|
+            Domain.new(domain_data, channel)
+          end
+          
+          channel_response[:configurations].each do |configuration_data|
+            Configuration.new(configuration_data, channel)
+          end
+          
+          channel
+        end
       end
     end
   end

data/lib/restpack-core-client/cache.rb

@@ -4,7 +4,7 @@ module RestPack
       class Cache
         def initialize(api)
           @api = api
-          @domain_to_channel = {}
+          @channel_ids = {}
           @channels = {}
         end
         
@@ -13,16 +13,18 @@ module RestPack
           Cache.new(api)
         end
         
-        def get_channel(domain_identifier) #TODO: GJ: convert channel response into hierarchical structure
-          domain = get_domain(domain_identifier)
-          @channels[domain[:channel_id]] ||= @api.get_channel(domain[:channel_id])
+        def get_channel(domain_identifier)
+          channel_id = get_channel_id(domain_identifier)
+          
+          @channels[channel_id] ||= @api.get_channel(channel_id)
         end
         
-        def get_domain(domain_identifier)
-          @domain_to_channel[domain_identifier] ||= @api.get_domain(domain_identifier)
+        def get_channel_id(domain_identifier)
+          @channel_ids[domain_identifier] ||= @api.get_domain(domain_identifier)[:channel_id]
         end
-        
+
       end
     end
   end
 end
+

data/lib/restpack-core-client/models/application.rb

@@ -0,0 +1,16 @@
+module RestPack::Core::Client
+  class Application
+    attr_accessor :id, :name, :channel, :domains, :configurations
+    
+    def initialize(data, channel)
+      @domains        = []
+      @configurations = []
+      
+      @id = data[:id]
+      @name = data[:name]
+      
+      @channel = channel
+      @channel.applications << self
+    end
+  end
+end

data/lib/restpack-core-client/models/channel.rb

@@ -0,0 +1,26 @@
+module RestPack::Core::Client
+  class Channel
+    attr_accessor :id, :name, :applications, :domains, :configurations
+
+    def initialize(data)
+      @applications   = []
+      @domains        = []
+      @configurations = []
+  
+      @id = data[:channel][:id]
+      @name = data[:channel][:name]
+    end
+
+    def get_application(id)
+      @applications.find { |a| a.id == id }
+    end
+
+    def get_domain(id)
+      @domains.find { |a| a.id == id }
+    end
+
+    def get_configuration(id)
+      @configurations.find { |a| a.id == id }
+    end
+  end
+end

data/lib/restpack-core-client/models/configuration.rb

@@ -0,0 +1,19 @@
+module RestPack::Core::Client
+  class Configuration
+    attr_accessor :id, :key, :value, :channel, :application, :domain
+    
+    def initialize(data, channel)          
+      @id = data[:id]
+      @key = data[:key]
+      @value = data[:value]
+      
+      @channel = channel
+      @application = channel.get_application(data[:application_id])
+      @domain = channel.get_domain(data[:domain_id])
+      
+      @channel.configurations << self
+      @application.configurations << self if @application
+      @domain.configurations << self if @domain
+    end
+  end
+end

data/lib/restpack-core-client/models/domain.rb

@@ -0,0 +1,18 @@
+module RestPack::Core::Client
+  class Domain
+    attr_accessor :id, :identifier, :channel, :application, :configurations
+    
+    def initialize(data, channel)
+      @configurations = []
+      
+      @id = data[:id]
+      @identifier = data[:identifier]
+      
+      @channel = channel
+      @application = channel.get_application(data[:application_id])
+      
+      @channel.domains << self
+      @application.domains << self
+    end
+  end
+end

data/lib/restpack-core-client/version.rb

@@ -1,7 +1,7 @@
 module RestPack
   module Core
     module Client
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

data/spec/cache_spec.rb

@@ -6,22 +6,6 @@ describe RestPack::Core::Client::Cache do
   let(:cache) { RestPack::Core::Client::Cache.new(api) }
   
   context "with an empty cache" do
-      
-    describe "#get_domain" do
-      it "makes a single API call" do
-        api.should_receive(:get_domain).with('www.incremental.ie').and_return({ id: 1, channel_id: 2 })
-        3.times { cache.get_domain('www.incremental.ie') }
-      end
-    end
-    
-    describe "#get_channel" do
-      it "makes single API calls" do
-        api.should_receive(:get_domain).with('www.incremental.ie').and_return({ id: 1, channel_id: 2 })
-        api.should_receive(:get_channel).with(2).and_return({ channel_id: 2 })
-        
-        3.times { cache.get_channel('www.incremental.ie') }
-      end
-    end
-    
+    pending
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restpack-core-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -91,6 +91,10 @@ files:
 - lib/restpack-core-client.rb
 - lib/restpack-core-client/api.rb
 - lib/restpack-core-client/cache.rb
+- lib/restpack-core-client/models/application.rb
+- lib/restpack-core-client/models/channel.rb
+- lib/restpack-core-client/models/configuration.rb
+- lib/restpack-core-client/models/domain.rb
 - lib/restpack-core-client/version.rb
 - restpack-core-client.gemspec
 - spec/cache_spec.rb