goat 0.3.32 → 0.3.33

data/goat.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'goat'
-  s.version = '0.3.32'
+  s.version = '0.3.33'
   s.summary = 'Pre-release beta version of Goat'
   s.author = 'Patrick Collison'
   s.email = 'patrick@collison.ie'

data/lib/goat/mongo.rb

@@ -26,3 +26,29 @@ module Mongo
     end
   end
 end
+
+module MongoComponent
+  def self.db_notifications; @db_notifications ||= {}; end
+
+  def self.db_notification_subscribe(coll, depkey, &blk)
+    db_notifications[coll] = depkey
+
+    Goat::NotificationCenter.subscribe(self, :db_notification_recv,
+      'type' => 'db_action',
+      'collection' => coll
+    )
+  end
+
+  def self.db_notification_recv(notif)
+    if notif['obj'] && notif['collection']
+      depkey = db_notifications[notif['collection']]
+      if depkey && (dep = notif['obj'][depkey])
+        rerender_and_update([dep])
+      end
+    else
+      raise "Invalid notification: #{notif.inspect}"
+    end
+  end
+end
+
+

data/lib/goat/notifications.rb

@@ -28,16 +28,20 @@ module Goat
       Receiver.start(@host, @recv_port)
     end
 
-    def self.enabled?; @configured; end
-
     def self.configure(opts={})
-      opts = {:host => '127.0.0.1', :recv_port => 8000, :send_port => 8001}.merge(opts)
-      @configured = true
       @host = opts[:host]
       @recv_port = opts[:recv_port]
       @send_port = opts[:send_port]
+    end
 
-      EM.next_tick { self.start_receiver }
+    def self.set_defaults
+      @host ||= '127.0.0.1'
+      @recv_port ||= 8000
+      @send_port ||= 8001
+    end
+
+    def self.schedule
+      EM.next_tick { set_defaults; self.start_receiver }
     end
 
     def self.subscribers; @subscribers ||= Set.new; end
@@ -92,6 +96,8 @@ module Goat
     end
 
     def self.notify(notif)
+      set_defaults # maybe #schedule or #configure never got called
+
       if Dynamic.variable?(:txn)
         notif['txn'] = Dynamic[:txn]
         notif['txn_pgid'] = Dynamic[:txn_pgid]

data/lib/goat/state-srv.rb

@@ -1,9 +1,17 @@
 module Goat
   module StateSrvClient
     def self.configure(opts={})
-      # TODO implement fully
-      EM.next_tick { StateSrvConnection.connect(opts[:host] || '127.0.0.1',
-                                                opts[:port] || 8011) }
+      @host = opts[:host]
+      @port = opts[:port]
+    end
+
+    def self.schedule
+      EM.next_tick {
+        StateSrvConnection.connect(
+          @host || '127.0.0.1',
+          @port || 8011
+        )
+      }
     end
 
     def self.send_message(type, m, sync=false)

data/lib/goat.rb

@@ -69,67 +69,77 @@ module Goat
 
   def self.goat_path(f); File.join(File.dirname(__FILE__), 'goat', f); end
 
-  def self.extend_mongo
-    require goat_path('mongo')
-  end
+  class Config
+    def initialize
+      @config = {}
+    end
 
-  def self.enable_notifications(opts={})
-    NotificationCenter.configure(opts)
-  end
+    def enable_notifications(opts={})
+      NotificationCenter.configure(opts)
+    end
 
-  def self.enable_statesrv(opts={})
-    StateSrvClient.configure(opts)
-  end
+    def enable_statesrv(opts={})
+      StateSrvClient.configure(opts)
+    end
 
-  def self.enable_appsrv(opts={})
-    UpdateDispatcher.enable
-  end
+    def enable_mongo(opts={})
+      require Goat.goat_path('mongo')
+    end
 
-  def self.load_all(dir_fragment)
-    dir = File.join(Goat.setting!(:root), dir_fragment)
-    if File.directory?(dir)
-      Dir.entries(dir).select{|f| f =~ /\.rb$/}.each {|f| require(File.join(dir, f))}
+    def get!(opt)
+      if @config.include?(opt)
+        @config[opt]
+      else
+        raise "#{opt} not set"
+      end
     end
-  end
 
-  @settings = {}
-  def self.setting(opt)
-    @settings[opt]
-  end
+    def add_component_helpers(modul)
+      Goat::Component.send(:include, modul)
+    end
 
-  def self.setting!(opt)
-    if @settings.include?(opt)
-      @settings[opt]
-    else
-      raise "#{opt} not set"
+    def [](k); @config[k]; end
+    def []=(k, v)
+      @config[k] = v
+
+      meth = "enable_#{k}".to_sym
+      if self.respond_to?(meth)
+        self.send(meth, v)
+      end
     end
   end
 
-  def self.settings; @settings; end
-
-  def self.add_component_helpers(modul)
-    Goat::Component.send(:include, modul)
+  def self.load_all(dir_fragment)
+    dir = File.join(Goat.config.get!(:root), dir_fragment)
+    if File.directory?(dir)
+      Dir.entries(dir).select{|f| f =~ /\.rb$/}.each {|f| require(File.join(dir, f))}
+    end
   end
 
+  def self.config; @config; end
+
   def self.configure(&blk)
-    blk.call
+    @config = Config.new
+
+    blk.call(@config)
 
     load_all('components')
     load_all('pages')
 
-    Goat.extend_mongo if Goat.setting(:mongo)
-
-    if p = Goat.setting(:press)
-      Goat::Static.press = p
-    end
+    # disabled for now
+    #if p = Goat.setting(:press)
+    #  Goat::Static.press = p
+    #end
 
-    if Goat.setting(:debug)
+    if @config[:debug]
       if defined?(Thin)
         Thin::Logging.debug = true
       end
     end
 
-    NotificationCenter.configure(Goat.setting(:notifications)) if Goat.setting(:notifications)
+    Goat::StateSrvClient.schedule
+    Goat::NotificationCenter.schedule
+    UpdateDispatcher.enable
   end
 
   def self.rack_builder(app, opts={})
@@ -137,13 +147,13 @@ module Goat
     opts = defaults.merge(opts)
 
     Rack::Builder.new do
-      if cookies = Goat.setting(:cookies)
+      if cookies = Goat.config[:cookies]
         use Rack::Session::Cookie, cookies
       end
 
       use opts[:logger]
 
-      if static = Goat.setting(:static)
+      if static = Goat.config[:static]
         use Rack::Static, :urls => static.fetch(:urls), :root => static.fetch(:root)
       end
 
@@ -153,6 +163,11 @@ module Goat
     end
   end
 
+  def self.run_app(app, opts={})
+    builder = rack_builder(app, opts)
+    Rack::Handler::Thin.run(builder.to_app)
+  end
+
   class NotFoundError < RuntimeError
     attr_reader :path
 
@@ -437,10 +452,10 @@ module Goat
       if name =~ /\.erb$/ # allow an absolute path to be passed
         erbf = name
       else
-        erbf = File.join(Goat.setting!(:root), 'views', "#{name}.erb")
+        erbf = File.join(Goat.config.get!(:root), 'views', "#{name}.erb")
       end
 
-      layf = File.join(Goat.setting!(:root), 'views', 'layout.erb')
+      layf = File.join(Goat.config.get!(:root), 'views', 'layout.erb')
       template = Tilt[:erb].new(erbf) { File.read(erbf) }
 
       layout = File.read(layf) if File.exists?(layf) && !partial && use_layout
@@ -533,10 +548,6 @@ module Goat
       around_handlers << [:after, blk]
     end
 
-    def enable_notifications(opts={})
-      NotificationCenter.configure(opts)
-    end
-
     def respond_success; [200, {}, ['ok']]; end
     def respond_failed; [500, {}, ['failed']]; end
 
@@ -721,7 +732,7 @@ module Goat
 
     def unpressed_component_classes
       ordered_component_classes.to_a.reject do |cls|
-        Goat.setting(:press) && Goat::Static.pressed?(cls)
+        Goat.config[:press] && Goat::Static.pressed?(cls)
       end
     end
 
@@ -759,6 +770,9 @@ module Goat
 
     def self.handle_request(app)
       pg = self.new(app)
+      
+      raise "Page #{pg} has no id: did you forget to call super()?" unless pg.id
+
       pg.response
     end
 
@@ -1283,8 +1297,9 @@ module Goat
     def clientside_args; []; end
 
     def clientside_instance
-      args = [id, @parent ? @parent.id : nil, clientside_args].to_json[1..-2]
-      "(new #{self.class.name}('#{self.class.name}', #{args}))"
+      args = [id, @parent ? @parent.id : nil, clientside_args]
+      argjson = args.to_json[1..-2] # strip the braces
+      "(new #{self.class.name}('#{self.class.name}', #{argjson}))"
     end
 
     def self.rpc(name, opts={}, &blk)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: goat
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 81
   prerelease: false
   segments: 
   - 0
   - 3
-  - 32
-  version: 0.3.32
+  - 33
+  version: 0.3.33
 platform: ruby
 authors: 
 - Patrick Collison
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 +00:00
+date: 2011-01-18 00:00:00 +00:00
 default_executable: 
 dependencies: []