maccman-bowline 0.1.10 → 0.3.0

data/bin/bowline-gen

@@ -3,4 +3,4 @@
 require File.join(File.dirname(__FILE__), *%w[.. lib bowline])
 require 'bowline/generators'
 
-Bowline::Generators.run_cli(Dir.pwd, 'bowline', Bowline::VERSION, ARGV)
+Bowline::Generators.run_cli(Dir.pwd, 'bowline', Bowline::Version::STRING, ARGV)

data/bowline.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bowline}
-  s.version = "0.1.10"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
@@ -18,10 +18,8 @@ Gem::Specification.new do |s|
     ".gitignore",
      "History.txt",
      "MIT-LICENSE",
-     "Manifest.txt",
      "README.txt",
      "Rakefile",
-     "VERSION",
      "assets/jquery.bowline.js",
      "assets/jquery.chain.js",
      "assets/jquery.js",
@@ -59,6 +57,7 @@ Gem::Specification.new do |s|
      "lib/bowline/tasks/database.rake",
      "lib/bowline/tasks/log.rake",
      "lib/bowline/tasks/misc.rake",
+     "lib/bowline/version.rb",
      "templates/Rakefile",
      "templates/binder.rb",
      "templates/config/application.yml",
@@ -68,6 +67,7 @@ Gem::Specification.new do |s|
      "templates/config/manifest",
      "templates/config/tiapp.xml",
      "templates/gitignore",
+     "templates/helper.rb",
      "templates/migration.rb",
      "templates/model.rb",
      "templates/public/icon.png",

data/lib/bowline.rb

@@ -15,7 +15,7 @@ module Bowline
   
   # Change which page we're on
   def self.show_view(name)
-    js.window.location = "app://public/#{name}.html"
+    js.location = "app://public/#{name}.html"
   end
   
   class Base
@@ -24,6 +24,8 @@ end
 
 $LOAD_PATH << File.dirname(__FILE__)
 
+require 'bowline/version'
+
 require 'bowline/ext/object'
 require 'bowline/ext/array'
 require 'bowline/ext/class'

data/lib/bowline/binders.rb

@@ -1,8 +1,6 @@
 module Bowline
   module Binders
-    class Base
-      cattr_accessor :params
-    
+    class Base    
       class << self
         # See Bowline::js
         def js
@@ -16,7 +14,7 @@ module Bowline
       
         # See the Observer class
         def observer
-          @@observer ||= Observer.new
+          @observer ||= Observer.new
         end
         
         # See Bowline::logger
@@ -28,6 +26,10 @@ module Bowline
         def show_view(*args)
           Bowline::show_view(*args)
         end
+        
+        def params
+          @params
+        end
       
         def params=(p)
           case p
@@ -36,18 +38,18 @@ module Bowline
             # serialized form) - we need to make it into
             # a nestled hash. Stolen from Ramaze
             m = proc {|_,o,n|o.merge(n,&m)}
-            @@params = params.inject({}) do |hash, (key, value)|
+            @params = params.inject({}) do |hash, (key, value)|
               parts = key.split(/[\]\[]+/)
               hash.merge(parts.reverse.inject(value) { |x, i| {i => x} }, &m) 
             end
           else
-            @@params = p
+            @params = p
           end
         end
       
         def setup(d)
-          @@elements ||= []
-          @@elements << d
+          @elements ||= []
+          @elements << d
           self.item_sync!
         end
       

data/lib/bowline/binders/collection.rb

@@ -1,23 +1,26 @@
 module Bowline
   module Binders
     class Collection < Base
-      cattr_accessor :items
       class << self
         def items=(args)
-          @@items = args
+          @items = args
           self.item_sync!
-          @@items
+          @items
+        end
+        
+        def items
+          @items ||= []
         end
     
         def item_sync!
-          return unless @@items && @@elements
-          @@elements.each {|i| 
-            i.updateCollection(@@items.to_js) 
+          return unless @items && @elements
+          @elements.each {|i| 
+            i.updateCollection(@items.to_js) 
           }
         end
     
         def find(id)
-          @@items.find {|item| 
+          @items.find {|item| 
             item.id == id
           }
         end

data/lib/bowline/binders/singleton.rb

@@ -1,23 +1,26 @@
 module Bowline
   module Binders
     class Singleton < Base
-      cattr_accessor :item
       class << self
+        def item
+          @item
+        end
+        
         def item=(arg)
-          @@item = arg
+          @item = arg
           self.item_sync!
         end
     
         def item_sync!
-          return unless @@item && @@elements
+          return unless @item && @elements
           # Call the chain.js function 'item' on elements
-          @@elements.each {|i| 
-            i.updateSingleton(@@item.to_js) 
+          @elements.each {|i| 
+            i.updateSingleton(@item.to_js) 
           }
         end
       
         def find(*a)
-          @@item
+          @item
         end
       end
     end

data/lib/bowline/commands/run.rb

@@ -1,11 +1,4 @@
-require "config/environment"
-exec_path = File.join(APP_ROOT, 'build', 'osx', "#{APP_NAME}.app")
-
-unless File.exist?(exec_path)
-  require 'rake'
-  require 'bowline/tasks/bowline'
-  Rake::Task['app:bundle'].invoke
-end
-
-# Debug view
-`open #{File.join(exec_path, 'Contents', 'MacOS', APP_NAME)}`
+require 'rake'
+require 'bowline/tasks/bowline'
+ENV['TIRUN'] = 'true'
+Rake::Task['app'].invoke

data/lib/bowline/ext/array.rb

@@ -1,5 +1,5 @@
 class Array
   def to_js(opts = {})
-    collect {|i| i.to_js(opts) }
+    map {|i| i.to_js(opts) }
   end
 end

data/lib/bowline/generators.rb

@@ -56,4 +56,5 @@ end
 require "bowline/generators/application"
 require "bowline/generators/binder"
 require "bowline/generators/model"
+require "bowline/generators/helper"
 require "bowline/generators/migration"

data/lib/bowline/generators/helper.rb

@@ -8,12 +8,19 @@ module Bowline::Generators
       []
     end
     
-    first_argument :name, :required => true, :desc => "helper name"
+    def module_name
+      "#{self.name.camel_case}Helper"
+    end
     
+    def file_name
+      "#{name}_helper"
+    end
+    
+    first_argument :name, :required => true, :desc => "helper name"
     
-    template :model do |template|
-      template.source       = "model.rb"
-      template.destination  = "app/models/#{file_name}.rb"
+    template :helper do |template|
+      template.source       = "helper.rb"
+      template.destination  = "app/helpers/#{file_name}.rb"
     end
   end
   

data/lib/bowline/helpers.rb

@@ -1,4 +1,7 @@
 module Bowline
-  module Helpers 
+  module Helpers
+    def self.init
+      Bowline.js.send("bowline_helper=", method(:send))
+    end
   end
 end

data/lib/bowline/initializer.rb

@@ -208,8 +208,8 @@ module Bowline
     def load_application_helpers
       helpers = configuration.helpers
       helpers = helpers.map(&:constantize)
-      helpers.each {|h| Helpers.module_eval { include h } }
-      Bowline.js.helper = Helpers
+      helpers.each {|h| Helpers.module_eval { extend h } }
+      Helpers.init
     end
         
     def load_application_classes
@@ -252,6 +252,10 @@ module Bowline
       })
     end
     
+    def initialize_js
+      Bowline.js.bowline_loaded
+    end
+    
     def process
       Bowline.configuration = configuration
       
@@ -288,6 +292,8 @@ module Bowline
       load_application_classes
       load_application_helpers
       
+      initialize_js
+      
       Bowline.initialized = true
     end
     
@@ -475,7 +481,7 @@ module Bowline
      end
      
      def helpers
-       Dir[helper_glob].map {|f| File.basename(f) }
+       Dir[helper_glob].map {|f| File.basename(f, '.rb').classify }
      end
      
      # Adds a block which will be executed after bowline has been fully initialized.
@@ -514,6 +520,7 @@ module Bowline
          app/binders
          app/models
          app/remote
+         app/helpers
          lib
          vendor
        ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
@@ -528,9 +535,9 @@ module Bowline
 
      def default_eager_load_paths
        %w(
+         app/binders
          app/models
          app/remote
-         app/binders
          app/helpers
        ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
      end

data/lib/bowline/tasks/app.rake

@@ -130,10 +130,13 @@ tiprocess:0.4.4
     command << File.join(ti_lib_path, "tibuild.py")
     command << "-d #{build_path}"
     command << "-s #{ti_path}"
-    command << "-r"
+    command << "-r" if ENV['TIRUN']
     command << "-a #{ti_lib_path}"
     command << app_path
 
     exec(command.join(' '))
   end
-end
+end
+
+desc "Bundle and build app"
+task :app => ["app:bundle", "app:build"]

data/lib/bowline/version.rb

@@ -0,0 +1,11 @@
+module Bowline  
+  module Version #:nodoc:
+    MAJOR    = 0
+    MINOR    = 3
+    TINY     = 0
+    
+    STRING   = [MAJOR, MINOR, TINY].join('.')
+    
+    CODENAME = "If you can meet with Triumph and Disaster".freeze
+  end
+end

data/templates/helper.rb

@@ -0,0 +1,2 @@
+module <%= module_name %>
+end

data/templates/public/index.html

@@ -11,7 +11,6 @@
 	<script src="javascripts/jquery.js" type="text/javascript" charset="utf-8"></script>
 	<script src="javascripts/jquery.chain.js" type="text/javascript" charset="utf-8"></script>
   <script src="javascripts/jquery.bowline.js" type="text/javascript" charset="utf-8"></script>
-  <script src="../script/init" type="text/ruby"></script>
   <script src="javascripts/application.js" type="text/javascript" charset="utf-8"></script>
   <link rel="stylesheet" href="stylesheets/application.css" type="text/css" charset="utf-8">
   <script type="text/javascript" charset="utf-8">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maccman-bowline
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
+  version: 0.3.0
 platform: ruby
 authors: 
 - Alex MacCaw
@@ -44,10 +44,8 @@ files:
 - .gitignore
 - History.txt
 - MIT-LICENSE
-- Manifest.txt
 - README.txt
 - Rakefile
-- VERSION
 - assets/jquery.bowline.js
 - assets/jquery.chain.js
 - assets/jquery.js
@@ -85,6 +83,7 @@ files:
 - lib/bowline/tasks/database.rake
 - lib/bowline/tasks/log.rake
 - lib/bowline/tasks/misc.rake
+- lib/bowline/version.rb
 - templates/Rakefile
 - templates/binder.rb
 - templates/config/application.yml
@@ -94,6 +93,7 @@ files:
 - templates/config/manifest
 - templates/config/tiapp.xml
 - templates/gitignore
+- templates/helper.rb
 - templates/migration.rb
 - templates/model.rb
 - templates/public/icon.png

data/Manifest.txt

@@ -1,58 +0,0 @@
-.gitignore
-History.txt
-MIT-LICENSE
-Manifest.txt
-README.txt
-Rakefile
-assets/jquery.bowline.js
-assets/jquery.chain.js
-assets/jquery.js
-bin/bowline-gen
-bowline.gemspec
-examples/account.rb
-examples/example.js
-examples/twitter.html
-examples/tweets.rb
-examples/users.rb
-lib/bowline.rb
-lib/bowline/binders.rb
-lib/bowline/binders/collection.rb
-lib/bowline/binders/singleton.rb
-lib/bowline/commands/console.rb
-lib/bowline/commands/generate.rb
-lib/bowline/commands/run.rb
-lib/bowline/ext/array.rb
-lib/bowline/ext/class.rb
-lib/bowline/ext/object.rb
-lib/bowline/ext/string.rb
-lib/bowline/gem_dependency.rb
-lib/bowline/generators.rb
-lib/bowline/generators/application.rb
-lib/bowline/generators/binder.rb
-lib/bowline/generators/migration.rb
-lib/bowline/generators/model.rb
-lib/bowline/initializer.rb
-lib/bowline/jquery.rb
-lib/bowline/observer.rb
-lib/bowline/tasks/app.rake
-lib/bowline/tasks/bowline.rb
-lib/bowline/tasks/database.rake
-lib/bowline/tasks/log.rake
-lib/bowline/tasks/misk.rake
-templates/Rakefile
-templates/binder.rb
-templates/config/application.yml
-templates/config/boot.rb
-templates/config/database.yml
-templates/config/environment.rb
-templates/config/manifest
-templates/config/tiapp.xml
-templates/gitignore
-templates/migration.rb
-templates/model.rb
-templates/public/index.html
-templates/public/javascripts/application.js
-templates/public/stylesheets/application.css
-templates/script/console
-templates/script/init
-templates/script/run

data/VERSION

@@ -1 +0,0 @@
-0.1.10