strobe 0.3.9 → 0.3.10

data/lib/strobe/association.rb

@@ -41,10 +41,15 @@ module Strobe
       return item unless targets = params[target_pluralized]
 
       if collection?
-        raise NotImplemented
+        collection = item[name.to_s] = []
+        id, key = item["id"], "#{source.singular_resource_name}_id"
+
+        targets.each do |target|
+          collection << target if target[key] == id
+        end if id
       else
         if id = item["#{name}_id"]
-          return item.merge(name.to_s => targets.find { |t| t["id"] == id })
+          item.merge!(name.to_s => targets.find { |t| t["id"] == id })
         end
       end
 
@@ -80,16 +85,21 @@ module Strobe
       ruby <<   "def #{name}=(val)"
 
       if collection?
-
-        ruby << "  raise NotImplementedError"
-
+        ruby << "  if val.is_a?(Array)"
+        ruby << "    @__#{name} = Strobe::Collection.new( "                      \
+                "      #{target_name}, { '#{source.singular_resource_name}_id' " \
+                "      => self[:id] }, val)"
+        ruby << "  elsif val.is_a?(Strobe::Collection)"
+        ruby << "    @__#{name} = val"
+        ruby << "  else"
+        ruby << "    raise 'invalid association type for #{name}='"
+        ruby << "  end"
       else
-
         ruby << "  if val"
         ruby << "    if val.is_a?(Hash)"
         ruby << "      val = #{target_name}.new(val)"
         ruby << "    elsif !val.is_a?(#{target_name})"
-        ruby << "      raise 'fail'"
+        ruby << "      raise 'invalid association type for #{name}='"
         ruby << "    end"
 
         ruby << "    self[:#{name}_id] = val[:id]" if autoload?
@@ -98,7 +108,6 @@ module Strobe
         ruby << "    self[:#{name}_id] = nil" if autoload?
         ruby << "    @__#{name} = nil"
         ruby << "  end"
-
       end
 
       ruby <<   "end"

data/lib/strobe/collection.rb

@@ -4,8 +4,9 @@ module Strobe
 
     attr_reader :klass, :params
 
-    def initialize(klass, params = {})
+    def initialize(klass, params = {}, data=nil)
       @klass, @params = klass, params
+      @to_a = data.map { |hash| klass.new(hash) } if data
     end
 
     def where(params)

data/lib/strobe/resource/base.rb

@@ -143,13 +143,16 @@ module Strobe
       def merge!(params)
         params = with_indifferent_access(params || {})
 
-        extract_on_associations(params).each do |k, v|
-          if Base === v
-            send("#{k}=", v)
-          elsif inst = send(k)
-              inst.merge!(v)
+        self.class.associations.each do |key, assoc|
+          next unless params.key?(key)
+          value = params.delete(key)
+
+          if assoc.collection? || Base === value
+            send("#{key}=", value)
+          elsif inst = send(key)
+            inst.merge!(value)
           else
-            send("#{k}=", v)
+            send("#{key}=", value)
           end
         end
 
@@ -279,15 +282,6 @@ module Strobe
           val
         end
       end
-
-      def extract_on_associations(params)
-        {}.tap do |ret|
-          self.class.associations.keys.each do |key|
-            next unless params.key?(key)
-            ret[key] = params.delete(key)
-          end
-        end
-      end
     end
   end
 end

data/lib/strobe/resource/collection.rb

@@ -86,14 +86,14 @@ module Strobe
         end
 
         def denormalize_params(params)
-          if coll = params[pluralized_root]
+          if coll = params.delete(pluralized_root)
             coll.map do |item|
               associations.each do |n, assoc|
                 item = assoc.denormalize_params(item, params)
               end
               item
             end
-          elsif item = params[root]
+          elsif item = params.delete(root)
             associations.each do |n, assoc|
               item = assoc.denormalize_params(item, params)
             end

data/lib/strobe/resources/application.rb

@@ -14,7 +14,7 @@ module Strobe
       has n, :teams
       has n, :users
       has n, :deploys
-      has n, :platform_installs
+      has n, :platform_installs, :include => true
 
       filter :path
 
@@ -25,10 +25,11 @@ module Strobe
       end
 
       def web_install
-        # TODO: eventually it will be better to us name for identifying web platform
-        install = self.platform_installs.detect { |p| p.web? }
-        raise "Application does not have web platform" unless install
-        install.reload!
+        @web_install ||= begin
+          install = self.platform_installs.detect { |p| p.web? }
+          raise "Application does not have web platform" unless install
+          install
+        end
       end
 
       def web_url
@@ -40,10 +41,6 @@ module Strobe
           web_url
         else
           uri = web_install['environment_uri']
-
-          # TODO: remove next line when environment_uri stuff is released
-          uri = web_url if uri.blank?
-
           "#{environment}.#{uri}"
         end
       end
@@ -51,7 +48,7 @@ module Strobe
       def set_web_url!(url)
         return if url.blank?
         install = web_install
-        install['url'] = url
+        install['url'] = install['install_uri'] = url
         install.save!
       end
 

data/lib/strobe/version.rb

@@ -1,3 +1,3 @@
 module Strobe
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

metadata

@@ -2,7 +2,7 @@
 name: strobe
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors: 
 - Carl Lerche
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 +02:00
+date: 2011-10-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency