strobe 0.2.0.beta.1 → 0.2.0.beta.2

data/lib/strobe/association.rb

@@ -13,6 +13,10 @@ module Strobe
       'Strobe::Resources::' + name.to_s.classify
     end
 
+    def target_pluralized
+      name.to_s.pluralize
+    end
+
     def target
       @target ||= target_name.constantize
     end
@@ -25,10 +29,28 @@ module Strobe
       !options.key?(:autoload) || options[:autoload]
     end
 
+    def nested?
+      options[:nested]
+    end
+
     def include?
       options[:include]
     end
 
+    def denormalize_params(item, params)
+      return item unless targets = params[target_pluralized]
+
+      if collection?
+        raise NotImplemented
+      else
+        if id = item["#{name}_id"]
+          return item.merge(name.to_s => targets.find { |t| t["id"] == id })
+        end
+      end
+
+      item
+    end
+
     def reader
       ruby = []
       ruby <<   "def #{name}"

data/lib/strobe/cli/main.rb

@@ -1,3 +1,5 @@
+require "bpm"
+
 module Strobe
   class CLI::Main < CLI
     include CLI::Preview
@@ -159,7 +161,8 @@ module Strobe
 
       host = resource.deploy! :environment => options[:staging] && 'staging',
                               :callback    => CLI::DeployProgress.new,
-                              :sproutcore  => is_sproutcore?
+                              :sproutcore  => is_sproutcore?,
+                              :bpm_project => bpm_project
 
       say "The application has successfully been deployed and is available at #{host}"
     end
@@ -257,6 +260,10 @@ module Strobe
       File.exist?("#{path}/Buildfile")
     end
 
+    def bpm_project
+      BPM::Project.nearest_project Dir.pwd
+    end
+
     def determine_application_root
       if is_sproutcore?
         return "#{path}/tmp/build"

data/lib/strobe/cli/preview.rb

@@ -1,4 +1,5 @@
 require 'rack'
+require 'bpm'
 
 module Strobe
   module CLI::Preview
@@ -16,11 +17,29 @@ module Strobe
       is_sproutcore?? preview_sproutcore_application : preview_html_application
     end
 
+    def bpm_project
+      @bpm_project ||= BPM::Project.nearest_project(Dir.pwd)
+    end
+
     def preview_html_application
-      app = Rack::Static.new lambda { |e| [] }, :urls => [ '/' ], :root => '.'
-      app = Middleware::Rewrite.new(app)
-      app = Middleware::Addons.new(app, :settings => settings, :config => config)
-      app = Middleware::Proxy.new(app)
+      project = bpm_project
+
+      app = Rack::Builder.new do
+        use Middleware::Proxy
+        use Middleware::Addons
+        use Middleware::Rewrite
+
+        if project
+          map "/assets" do
+            run BPM::Pipeline.new project
+          end
+        end
+
+        map "/" do
+          run Rack::Static.new lambda { |e| [] }, :urls => [ '/' ], :root => '.'
+        end
+      end.to_app
+
       Server.start :app => app, :host => '0.0.0.0', :server => "thin", :Port => 9292
     end
 

data/lib/strobe/collection.rb

@@ -14,11 +14,13 @@ module Strobe
 
     def to_a
       @to_a ||= begin
-        resp = Strobe.connection.get klass.resource_uri, params
+        resp = Strobe.connection.get klass.collection_uri, params
         resp.validate!
 
         if resp.status == 200
-          resp.body[klass.pluralized_root].map do |hash|
+          denormalized = klass.denormalize_params(resp.body)
+
+          denormalized.map do |hash|
             klass.new(hash)
           end
         else

data/lib/strobe/connection.rb

@@ -117,7 +117,7 @@ module Strobe
 
       def initialize(connection, method, path, body, headers)
         @connection, @path, @body, @headers = connection, path, body, headers
-        @method = method.to_s.upcase
+        @method = method
       end
 
       def host; connection.host end
@@ -157,6 +157,9 @@ module Strobe
     end
 
     def request(method, path, body = nil, headers = {})
+      path   = path.dup
+      method = method.to_s.upcase
+
       headers.keys.each do |key|
         headers[key.to_s.downcase] = headers.delete(key)
       end
@@ -169,6 +172,22 @@ module Strobe
 
       headers['authorization'] ||= authorization_header
 
+      if method == "GET" || method == "HEAD"
+
+        case body
+        when Hash
+          qs = body.map { |k,v| "#{k}=#{v}" }.join('&')
+
+          if path.include?('?')
+            path << "&#{qs}"
+          else
+            path << "?#{qs}"
+          end
+        end
+
+        body = nil
+      end
+
       if body
         headers['content-type'] ||= 'application/json'
 

data/lib/strobe/resource/base.rb

@@ -31,7 +31,7 @@ module Strobe
           class_eval(assoc.reader)
           class_eval(assoc.writer)
 
-          if assoc.include?
+          if assoc.nested?
             validates_with AssociationValidator, :attributes => [name]
           end
 
@@ -71,6 +71,16 @@ module Strobe
           @root = root if root
           @root
         end
+
+        def include_query_string
+          to_include = associations.map do |n, assoc|
+            assoc.target_pluralized if assoc.include?
+          end.compact
+
+          if to_include.any?
+            "include=#{to_include.join(',')}"
+          end
+        end
       end
 
       attr_reader :response
@@ -93,7 +103,7 @@ module Strobe
       def params
         @params.dup.tap do |params|
           self.class.associations.each do |name, assoc|
-            next unless assoc.include? and inst = send(name)
+            next unless assoc.nested? and inst = send(name)
             params.deep_merge! name => inst.params
           end
         end

data/lib/strobe/resource/collection.rb

@@ -31,8 +31,12 @@ module Strobe
           root.pluralize
         end
 
-        def resource_uri
-          uri_prefix
+        def collection_uri
+          [ uri_prefix, include_query_string ].compact.join('?')
+        end
+
+        def resource_uri(id)
+          [ "#{uri_prefix}/#{id}", include_query_string ].compact.join('?')
         end
 
         def collection
@@ -80,6 +84,22 @@ module Strobe
             inst
           end
         end
+
+        def denormalize_params(params)
+          if coll = params[pluralized_root]
+            coll.map do |item|
+              associations.each do |n, assoc|
+                item = assoc.denormalize_params(item, params)
+              end
+              item
+            end
+          elsif item = params[root]
+            associations.each do |n, assoc|
+              item = assoc.denormalize_params(item, params)
+            end
+            item
+          end
+        end
       end
 
       def id
@@ -95,11 +115,11 @@ module Strobe
       end
 
       def reload(opts = {})
-        resp = Strobe.connection.get "#{self.class.resource_uri}/#{key}"
+        resp = Strobe.connection.get self.class.resource_uri(key)
         resp.validate! if opts[:validate]
 
         if resp.success?
-          self.params = resp.body[self.class.root]
+          self.params = self.class.denormalize_params(resp.body)
           self
         end
       end

data/lib/strobe/resource/singleton.rb

@@ -10,6 +10,11 @@ module Strobe
         end
 
         alias singular_resource_name resource_name
+
+        def denormalize_params(params)
+          # Nothing fancy implemented yet
+          params[pluralized_root]
+        end
       end
 
       # stuff

data/lib/strobe/resources/application.rb

@@ -68,6 +68,11 @@ module Strobe
 
             picked_root_app = false
 
+            if project = opts[:bpm_project]
+              project.rebuild_dependency_list(nil, false)
+              project.build :production, true
+            end
+
             if opts[:sproutcore]
               Dir["static/*"].each do |appdir|
                 next if File.file?(appdir)

data/lib/strobe/resources/me.rb

@@ -3,7 +3,7 @@ module Strobe
     class Me
       include Resource::Singleton
 
-      has 1, :user, :include => true, :autoload => false
+      has 1, :user, :nested => true, :autoload => false
 
       validates "user.password", :presence => true
     end

data/lib/strobe/resources/membership.rb

@@ -3,8 +3,8 @@ module Strobe
     class Membership
       include Resource::Collection
 
-      has 1, :team
-      has 1, :user
+      has 1, :team, :include => true
+      has 1, :user, :include => true
 
       validates :team,  :presence => true
       validates :email, :presence => true, :email => true

data/lib/strobe/resources/signup.rb

@@ -3,8 +3,8 @@ module Strobe
     class Signup
       include Resource::Singleton
 
-      has 1, :user,    :include => true, :autoload => false
-      has 1, :account, :include => true, :autoload => false
+      has 1, :user,    :nested => true, :autoload => false
+      has 1, :account, :nested => true, :autoload => false
 
       filter :password_confirmation
 

metadata

@@ -2,7 +2,7 @@
 name: strobe
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.2.0.beta.1
+  version: 0.2.0.beta.2
 platform: ruby
 authors: 
 - Carl Lerche
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-16 00:00:00 +09:00
+date: 2011-07-18 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,29 +25,29 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mime-types
+  name: bpm
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.16.0
+        version: 1.0.0.beta.3.pre
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: mime-types
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.16.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: thin
+  name: rack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -58,49 +58,60 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: em-http-request
+  name: thin
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.0.beta
+        version: 1.2.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: em-http-request
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.14.0
+        version: 1.0.0.beta
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: oauth
+  name: thor
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.4
+        version: 0.14.0
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: launchy
+  name: oauth
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.4.4
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: launchy
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 description: The client library for deploying applications to Strobe's HTML5 deployment platform
 email: 
 - carl@strobecorp.com