pullentity-client 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDRmZGU0YmM2ZTIzMjU5NDFkODE5Y2E4ZjQ1YmU0MjBjYTIxNDg5OA==
+    MTZlZjFlMWFiMzUxM2VkYjVkNWU3MmZiNGJmMDk3NmRjNDVmNjM0ZA==
   data.tar.gz: !binary |-
-    ODExMGQ3YmFjYTIzNWMzYjBjZDFkY2Q1NTEyNTc1NDc1NzQzMDczNw==
+    YmVhN2NjYzBlZDRjZDU4OGE5MDFmY2E2OGQwMTI0NzZlZTJjMDg0Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTllZjBmMjliZTA3ZTM0MGJiZTBhOGRmYzNmNjM1MGVmNjQ4ODA5MDgzZmUw
-    NDI1ZDQ1NDBmMzE1NzRhMGNlZDczNzE2YzRlMDgwODI4YzY1NjljNDMzM2Ez
-    MjQ0NDExOWU5NzU2YTNkZDQ5NWMyMWM5Mzg1NjI5Mzc0OTEwZWU=
+    ZDVhMWY2OTBmMWY5OTJjNDhmZmFhMjZjYjJkY2E1MzM5NjgyOGI1MGQ5YTQ4
+    MzYzNDMzN2FmZjI1ZmI0YTQ2NzNkNmZjMWVkYWM4MTA1ODIzMTg0ZmMyMWVh
+    NDA4NzFhMWY5M2JjODMxOGNjNjgxZDQzNTkzYjEyNTNiOGU5YzM=
   data.tar.gz: !binary |-
-    OTJmMzRlNTEzM2NjOWJmNWNiMzUwOTI5NTBmYzRlMjk4ZmY0NjBkOTE5NGVi
-    ZjQ3ODFjMDA5NmFhZDRjOWU1NzljODk4MzE1OWE2N2QxOWUxMGNlMDIwNjFj
-    MDk4ZjIyOTZjNGRkOTFmODA0N2ZiOGZlNDExYmNhZTdmOGJkYTQ=
+    YWE5ZGEyMjM2MGFkMmRlNWNkZmY2MzE1ZDRhMWE2N2EwZjBhNzc3MDJjYWQx
+    NzFiOGRjN2NlMjA5YzUxN2YyYjA0YTJlOWMxNWM1MzQ5MGY4MzVkMDU1NDQ5
+    ODUwYTM4ZTYxOGI4NmI4YzQxYWIzOGMyMWIyNzc4ODM1MDhiMGM=

data/README.md

@@ -28,10 +28,14 @@ Run project
 
     pullentity s # or pullentity server
 
-  since its a middleman app you can
+  since it's a middleman app you can
 
     middleman s or middleman server
 
+Setup (login, site selection & import data)
+
+    pullentity setup
+
 Setup your credentials
 
     pullentity login your@email.com

data/lib/pullentity-client/builder/middleman.rb

@@ -5,7 +5,7 @@ module Pullentity::Client
         include ::Pullentity::Client::Utils
 
         def build
-          system "middleman build --verbose"
+          system "export MIDDLEMAN_BUILD_TARGET=remote_theme; middleman build --verbose"
         end
 
       end

data/lib/pullentity-client/generate/auth.rb

@@ -94,8 +94,40 @@ module Pullentity
             response = conn.put("/api/v1/import_theme?auth_token=#{@token}&subdomain=#{@site}&theme_name=#{@theme_name}", payload )
             @json_body  = JSON.parse(response.body)
             say "#{@json_body[:status]} #{@json_body[:message]}", :green
+            asw = ask "upload assets too ?", :yellow
+            if asw == "yes"
+              upload_assets()
+            else
+              say "skipping assets upload", :green
+            end
           end
 
+          def upload_assets()
+            conn = Faraday.new(:url => domain) do |f|
+              f.request :multipart
+              f.request  :url_encoded             # form-encode POST params
+              #f.response :logger                  # log requests to STDOUT
+              f.adapter  Faraday.default_adapter  # make requests with Net::HTTP
+            end
+
+            say "upload application.js...", :green
+            payload = { :file => Faraday::UploadIO.new("#{location}/build/assets/javascripts/application.js", 'text/json') }
+            response = conn.put("/api/v1/upload_assets?auth_token=#{@token}&subdomain=#{@site}&theme_name=#{@theme_name}", payload )
+
+            say JSON.parse(response.body)
+
+            say "upload application.css...", :green
+            payload = { :file => Faraday::UploadIO.new("#{location}/build/assets/stylesheets/application.css", 'text/json') }
+            response = conn.put("/api/v1/upload_assets?auth_token=#{@token}&subdomain=#{@site}&theme_name=#{@theme_name}", payload )
+
+            say JSON.parse(response.body)
+          end
+
+          def images
+            Dir.glob("#{location}/build/assets/images/**/*")
+          end
+
+
           def get_site_activated_theme_data
             check_for_yaml
             site_api_call("/api/v1/sites/#{@site}.json")

data/lib/pullentity-client/helpers.rb

@@ -1,146 +1,52 @@
 require "middleman"
+require 'middleman-target'
 
 module Pullentity::Client::Helpers
 
-    #TODO separate elements in specific classes:
-    # views, asides, articles, header, tabbar, toolbar etc...
-
-    def footer(opts={}, &block)
-       content_tag :footer , opts do
-          capture(&block)
-       end
-    end
-
-    def article(opts={}, &block)
-       content_tag :article , opts do
-          capture(&block)
-       end
-    end
-
-    def section(opts={}, &block)
-       content_tag :section , opts do
-          capture(&block)
-       end
-    end
-
-    def header(opts={}, &block)
-       content_tag :header , opts do
-          capture(&block)
-       end
-    end
-
-    def hgroup(opts={}, &block)
-      if block_given?
-        content_tag :hgroup, options do
-           capture(&block)
-        end
-      else
-        content_tag :hgroup do
-          content_tag( :h1 , opts[:title]).concat(
-          content_tag( :h2 , opts[:subtitle])
-          )
-        end
-      end
-    end
-
-    def list_view(opts={}, &block)
-      options = {:class=>opts[:class]}.merge({"data-type" => "listview"})
-      content_tag :ul, options do
-         capture(&block)
-      end
-    end
-
-    def list_item(opts={}, &block)
-      options = {:class=>opts[:class]}
-      options = options.merge({ :class=>  "#{options[:class]} list-divider"}) if opts[:divider] == true
-      arrow = content_tag :div , :class=>"aside" do
-                content_tag( :i, "",{:class=>"icon-chevron-#{opts[:arrow]}"})
-              end if opts[:arrow].present?
-
-      if block_given?
-        content_tag :li, options do
-          capture(&block) << (arrow || "")
-        end
+    def javascript_include_tag(file)
+      if target?(:pullentity)
+        path = "/uploads/theme_asset/#{site_name}/theme/#{theme_name}/assets/#{file}"
+        "<script src='#{path}.js' type='text/javascript'></script>"
       else
-        content_tag :li, options do
-          content_tag :h1 do
-            opts[:content]
-          end
-        end
+        super
       end
     end
 
-    def divider(opts={}, &block)
-      if block_given?
-        list_item({:divider=>true}.merge(opts)) do
-          capture(&block)
-        end
+    def stylesheet_link_tag(file)
+      if target?(:pullentity)
+        path = "/uploads/theme_asset/#{site_name}/theme/#{theme_name}/assets/#{file}"
+        "<link href='#{path}.css' media='screen' rel='stylesheet' type='text/css' />"
       else
-        list_item({:divider=>true}.merge(opts))
+        super
       end
     end
 
-    def nav(opts={}, &block)
-      if block_given?
-        content_tag(:nav, opts) do
-          capture(&block)
-        end
-      else
+    def test_data_include_tag
+      unless target?(:pullentity)
+        javascript_include_tag "test-data"
       end
+   end
+    def site_name
+      hsh = YAML.load_file(location + "pullentity.yml")
+      hsh["site"]
     end
 
-    def tabbar(opts={}, &block)
-      opts = opts.merge({"data-type" => "tabbar"})
-      nav(opts, &block)
+    def theme_name
+      hsh = YAML.load_file(location + "pullentity.yml")
+      hsh["theme_name"]
     end
 
-    def toolbar(opts={}, &block)
-      opts = opts.merge({"data-type" => "toolbar"})
-      if opts[:control]
-        auto = opts[:auto] ? "autoWidth" : ""
-        nav(opts.reject!{ |k| k == :control || k == :auto }) do
-          content_tag(:div, :class=>"control-group #{auto}") do
-            capture(&block)
-          end
-        end
-      else
-        nav(opts, &block)
-      end
+    def location
+      @location ||= Pathname.new(Dir.pwd)
     end
 
-    def icon(type, opts={}, &block)
-      if block_given?
-        capture(&block) <<
-        content_tag( :i, "",{:class=>"icon-#{type}"})
+    def asset_pathxxxx(file)
+      if target?(:pullentity)
+        'yea'
       else
-        name = opts[:text].present? ? content_tag( :span, opts[:text]) : ""
-        name <<
-        content_tag( :i, "",{:class=>"icon-#{type}"})
+        super
       end
     end
 
-    def dialog(opts, &block)
-      options = {:role => "dialog", :data=>{:type=>opts[:type] || "modal", :transition=>opts[:transition] || "slideup"}}
-      opts = opts.merge(options)
-      if block_given?
-        content_tag(:div, opts) do
-          capture(&block)
-        end
-      else
-      end
-    end
-
-    def render_tabbar(tabbar)
-      partial("views/tabbars/#{tabbar}")
-    end
-
-    def render_dialog(dialog)
-      partial("views/dialogs/#{dialog}")
-    end
-
-    def render_toolbar(tabbar)
-      partial("views/toolbars/#{tabbar}")
-    end
-
 
 end

data/lib/pullentity-client/templates/app/views/shared/head.haml

@@ -12,8 +12,9 @@
 %script{:src => "https://raw.github.com/brandonaaron/livequery/master/jquery.livequery.js"}
 
 = javascript_include_tag "application"
+= stylesheet_link_tag "application"
 
-= javascript_include_tag "test-data"
+= test_data_include_tag
 
 = yield_content(:application_js)
 

data/lib/pullentity-client/templates/app/views/shared/js.haml

@@ -24,7 +24,7 @@
       });
     });
 
-    $('#myCarousel')
+    $('.myCarousel')
       .livequery(function(){
       $(this).find(".item").first().addClass('active');
       $(this).carousel();

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

@@ -21,3 +21,12 @@ configure :build do
   activate :minify_javascript
   activate :relative_assets
 end
+
+activate :target do |target|
+
+  target.build_targets = {
+    "pullentity" => {
+      :includes => %w[remote_theme]
+    }
+  }
+end

data/lib/pullentity-client/templates/defaults/test-data.js.erb

@@ -81,9 +81,9 @@ $(document).ready ->
       else
         console.warn("not matching url")
 
-  window.render_theme = (theme_html)->
+  window.render_theme = (theme_html, data_hsh = window.data)->
     if theme_html?
-      view = Mustache.to_html(theme_html, window.data)
+      view = Mustache.to_html(theme_html, data_hsh)
       $("#content").html view
     else
       html = "<div style='margin:20px'><h1>Theme \"#{window.data.project.theme_template.name}\" not found!<h1>"
@@ -115,7 +115,7 @@ $(document).ready ->
     $.each collection, (key, val) ->
       window.data["photos"].push
        img_medium: remote_path( val.image.image.medium.url)
-       img_large: remote_path(val.image.image.large.url)
+       img_large: remote_path(val.image.image.xlarge.url)
        img_thumb: remote_path(val.image.image.thumb.url)
        title: val.title
        caption: val.caption
@@ -137,7 +137,7 @@ $(document).ready ->
     else
       #console.log "should be list!!"
       data_projects = data_projects_for_list()
-      render_theme($(window.list_theme).html())
+      render_theme($(window.list_theme).html(), data_projects)
 
     false
 
@@ -157,6 +157,7 @@ $(document).ready ->
     a = _.filter(window.data["projects"], (num) ->
       true  if num.section.public_url is section.public_url
     )
+
     project_collection = _.map a, (p)->
       p["project_photo"] = remote_path(p.photos[0].image.image.medium.url) unless p.photos.length == 0
       p

data/lib/pullentity-client/version.rb

@@ -1,5 +1,5 @@
 module Pullentity
   module Client
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/pullentity-client.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |gem|
   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("middleman-target")
   gem.add_runtime_dependency(%q<faraday>)
   gem.add_runtime_dependency("json")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pullentity-client
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - miguel michelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -150,6 +150,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.0.12
+- !ruby/object:Gem::Dependency
+  name: middleman-target
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement