pullentity-client 0.3.1 → 0.3.2

data/CHANGELOG.md

@@ -1,6 +1,12 @@
-0.0.1
+0.3.2
+  2013/08/01
+    fix build helper
+    upgrade to mm 3.1.4
+    Redirect rack
+0.3.0
   2013/07/31
     Add template layout for backbone client side app
+0.0.1
   2013/03/23
     Add login interaction for api
     add select sites

data/lib/pullentity-client/helpers.rb

@@ -1,5 +1,6 @@
 require "middleman"
 require 'middleman-target'
+
 URL_REMOTE = "http://pullentity.s3.amazonaws.com"
 
 module Pullentity::Client::Helpers
@@ -51,11 +52,15 @@ module Pullentity::Client::Helpers
     end
   end
 
-
 end
 
+# config.rb
+require 'rack/rewrite'
+
+
 module Pullentity::Client::MiddlemanConfig
   class << self
+
     def registered(app)
       app.helpers Pullentity::Client::Helpers
       app.set :site_name, site_name
@@ -69,13 +74,20 @@ module Pullentity::Client::MiddlemanConfig
       app.set :markdown, :layout_engine => :haml
       app.set :default_encoding, 'utf-8'
 
-      app.compass_config do |config|
-        # config is the Compass.configuration object
-        config.output_style = :compact
+      app.configure :build do
         if target?(:pullentity)
-          config.http_images_path = "#{URL_REMOTE}/uploads/theme_asset/#{site_name}/theme/#{theme_name}/assets"
+          activate :minify_css
+          activate :minify_javascript
+          app.set :http_prefix, "#{URL_REMOTE}"
+          app.set :images_dir,  "/uploads/theme_asset/#{site_name}/theme/#{theme_name}/assets"
         end
       end
+
+      app.use Rack::Rewrite do
+        r301 %r{/sections(.*)}, '/'
+        r301 %r{/projects(.*)}, '/'
+      end
+
     end
 
     def site_name

data/lib/pullentity-client/templates/defaults/config.erb

@@ -14,10 +14,4 @@ end
 
 activate :pullentity_config
 
-page "views/*", :layout => false
-
-configure :build do
-  activate :minify_css
-  activate :minify_javascript
-end
-
+page "views/*", :layout => false

data/lib/pullentity-client/version.rb

@@ -1,5 +1,5 @@
 module Pullentity
   module Client
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/lib/pullentity-client.rb

@@ -10,6 +10,7 @@ require 'thor'
 require 'erubis'
 require 'nokogiri'
 require 'json'
+require 'debugger'
 
 require 'tempfile'
 require 'pullentity-client/thor/shell/password'

data/pullentity-client.gemspec

@@ -26,12 +26,14 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency(%q<erubis>, ["~> 2.7.0"])
   gem.add_runtime_dependency(%q<rocco>, ["~> 0.7"])
   gem.add_runtime_dependency(%q<thor>, ["~> 0.15.4"])
-  gem.add_runtime_dependency(%q<compass>, ["~> 0.12.2"])
+  #gem.add_runtime_dependency(%q<compass>, ["~> 0.12.2"])
   gem.add_runtime_dependency(%q<session>, ["~> 3.1"])
-  gem.add_runtime_dependency(%q<middleman>, ["3.0.12"])
+  gem.add_runtime_dependency(%q<middleman>, ["3.1.4"])
   gem.add_runtime_dependency("middleman-target")
   gem.add_runtime_dependency(%q<faraday>)
   gem.add_runtime_dependency("json")
+  gem.add_runtime_dependency("rack-rewrite")
+
 
   # gem.add_development_dependency(%q<bundler>, ["~> 1.0.14"])
   gem.add_development_dependency(%q<bundler>, ["~> 1.1"])

data/vendor/assets/javascripts/pullentity-backbone/app/helpers/app_helper.js.coffee

@@ -1,8 +1,8 @@
 Handlebars.registerHelper 'SectionUrl', (section)->
-  "#sections/#{section.id}"
+  "/#sections/#{section.id}"
 
 Handlebars.registerHelper 'ProjectUrl', (project)->
-  "#projects/#{project.id}"
+  "/#projects/#{project.id}"
 
 Handlebars.registerHelper 'ProjectImg', (version)->
   v = version ? version : "url"

data/vendor/assets/javascripts/pullentity-backbone/app/models/project.js.coffee

@@ -6,6 +6,6 @@ class Pullentity.Collections.Projects extends Backbone.Collection
 
   url : ()->
     if @id
-      "#{Pullentity.Domain}.pullentity.com/api/v1/site/projects/#{@id}"
+      "#{Pullentity.Domain}.#{Pullentity.host}/api/v1/site/projects/#{@id}"
     else
-      "#{Pullentity.Domain}.pullentity.com/api/v1/site/projects"
+      "#{Pullentity.Domain}.#{Pullentity.host}/api/v1/site/projects"

data/vendor/assets/javascripts/pullentity-backbone/app/models/section.js.coffee

@@ -7,7 +7,7 @@ class Pullentity.Collections.Sections extends Backbone.Collection
 
   url : ()->
     if @id
-      "#{Pullentity.Domain}.pullentity.com/api/v1/site/sections/#{@id}"
+      "#{Pullentity.Domain}.#{Pullentity.host}/api/v1/site/sections/#{@id}"
     else
-      "#{Pullentity.Domain}.pullentity.com/api/v1/site/sections"
+      "#{Pullentity.Domain}.#{Pullentity.host}/api/v1/site/sections"
 

data/vendor/assets/javascripts/pullentity-backbone/app/models/site.js.coffee

@@ -1,7 +1,7 @@
 class Pullentity.Models.Site extends Backbone.Model
   url : ()->
     if @id
-      "#{Pullentity.Domain}.pullentity.com/api/v1/site"
+      "#{Pullentity.Domain}.#{Pullentity.host}/api/v1/site"
     else
-      "#{Pullentity.Domain}.pullentity.com/api/v1/sites"
+      "#{Pullentity.Domain}.#{Pullentity.host}/api/v1/sites"
 

data/vendor/assets/javascripts/pullentity-backbone/app/site.js.coffee

@@ -11,6 +11,7 @@ if _.isUndefined window.pullentity_domain
 
 window.Pullentity =
   Domain: window.pullentity_domain
+  host:  "pullentity.com" # "pullentity.dev:3000" #
   Models: {}
   Collections: {}
   Routers: {}

data/vendor/assets/javascripts/pullentity-backbone/app/views/main.js.coffee

@@ -23,6 +23,8 @@ class Pullentity.Views.Commons.Main extends Backbone.View
 
     @render()
 
+    @setupLinks()
+
     # quizas cargar router acá
 
   setTitle: ()=>
@@ -45,7 +47,7 @@ class Pullentity.Views.Commons.Main extends Backbone.View
       #console.log("get section #{id}")
       @find_in_section(id)
 
-    Backbone.history.start() #(pushState: true)
+    Backbone.history.start(pushState: true)
 
   render: ()=>
     #console.info("should render layout")
@@ -128,4 +130,26 @@ class Pullentity.Views.Commons.Main extends Backbone.View
       #console.error "error while creating Handlebars script out of template for [", $(@current_theme_obj), e
       throw e
 
+  setupLinks: ()=>
+    # Globally capture clicks. If they are internal and not in the pass
+    # through list, route them through Backbone's navigate method.
+    $(document).on "click", "a[href^='/']", (event) =>
+
+      href = $(event.currentTarget).attr('href')
+
+      # chain 'or's for other black list routes
+      passThrough = href.indexOf('sign_out') >= 0
+
+      # Allow shift+click for new tabs, etc.
+      if !passThrough && !event.altKey && !event.ctrlKey && !event.metaKey && !event.shiftKey
+        event.preventDefault()
+
+        # Remove leading slashes and hash bangs (backward compatablility)
+        url = href.replace(/^\//,'').replace('\#\/','')
+
+        # Instruct Backbone to trigger routing events
+        @app_router.navigate url, { trigger: true }
+
+        return false
+
 layout = new Pullentity.Views.Commons.Main

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pullentity-client
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -124,13 +124,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.15.4
 - !ruby/object:Gem::Dependency
-  name: compass
+  name: session
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,41 +138,41 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: session
+  name: middleman
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.1.4
 - !ruby/object:Gem::Dependency
-  name: middleman
+  name: middleman-target
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.12
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.12
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: middleman-target
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -188,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -204,7 +204,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rack-rewrite
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -430,12 +430,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4005454624083693998
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4005454624083693998
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25