pullentity-client 0.1.3 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzc1OTlmMmYwOTQ1N2E5Nzk0OTExMTU4YzVhZGNmMTg5OGY5NWI5Yg==
+    YzNhYzdmMTNkZTRhMjQzN2U5YzNhNTk2Mjk4MTQ5OWQyYTQ5MGRiZA==
   data.tar.gz: !binary |-
-    ZmY5Zjg3MWU0ODllMTc3NTRkNGEzY2NjMDYzZDY0NmM0NWJiYzI0YQ==
+    MWNiMTFiZDlkNGYwYjgzZjVmNjU4ZGFmMWUzNDE2NzdiYTVhNDkzOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OThmZTIwOGNmNjIzNDY2ODYzNWQ3MGVlNGEwNzZkNGE2NGMyMzUzNzBkY2Nh
-    NGFiZTExY2VlZWU4NWI1Mjk4NjIyYWY5YmY1MDAwMzFlZjZjZTkwN2VlMzRk
-    N2U4NTQ1MDExNTIxM2I2YjJiOTcyZmQxNzY0Njg1NTM4YWRjYWE=
+    MWExM2Y2YTRlMmI1MDU0OTM1NmJhOGQxMDYwMWEyOTczZTVhYTM4ZGQ4OGFh
+    NmNjZDMzZTNjM2I3MjRmYWYyM2NiZDBiNzQxOGQzMjgxYjNjOWFiOGE4NTdk
+    NjE2MWM2NzViYTg4M2I2NWQwM2ZjODNiYmUwODA1ZWJlY2NlNDk=
   data.tar.gz: !binary |-
-    ZGM0NGIxOTFjNmU2NmM4N2Y4MzMxNTU3NjI1OGQzMTRiNWI0ZDJjNjlhMTE4
-    NmUwNmM3ZDQ1ZmQzNmIxMDYyMDFlMzRlMWFmMTFlMzQ4NGFlMzA1MDlmZTU1
-    N2IyMjQwZjk3ZWJlZDcyYjE3ZWZiOGQ5YmQwZDY3Y2FhODg4ZmI=
+    NjkzMGJkODcxZGI3NDU0OTNjNThlOWU3MWY1ZDQ5OGNkZWVkYTc4YTY5Njk0
+    NjMyNDhmOTE1YjQ1MDQwNzgxMjVmNjQyN2NlYjczMDMyZDg1MGZiZGQwYjUx
+    Zjk0NDk0ZDZhYjZiNjk1OTJjYzAxZTZlOTBiYzNmZjEyODdmMWY=

data/CHANGELOG.md

@@ -1,4 +1,6 @@
 0.0.1
+  2013/07/31
+    Add template layout for backbone client side app
   2013/03/23
     Add login interaction for api
     add select sites

data/README.md

@@ -46,7 +46,7 @@ Choose the site you want to export theme.
 
 Export and install the theme for your site.
 
-    pullentity export
+    pullentity theme export
 
 
 

data/lib/pullentity-client/cli.rb

@@ -28,7 +28,7 @@ module Pullentity
         say "Version #{::Pullentity::Client::VERSION}"
       end
 
-      map %w(r) => 'server'
+      map %w(s) => 'server'
       desc "server ", "run middleman app"
       def server
         system "echo == :::pullentity-client STARTING::: =="

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

@@ -1,3 +1,5 @@
+
+# -*- encoding: utf-8 -*-
 require 'session'
 
 module Pullentity
@@ -45,12 +47,14 @@ module Pullentity
           def check_for_yaml
             begin
               hsh = YAML.load_file(location + "pullentity.yml")
+
               @token      = hsh["auth_token"]
               @site       = hsh["site"]
               @theme_name = hsh["theme_name"]
               if hsh["auth_token"].empty?
                 say "Error, the auth_token is empty", :red
-                say "run: pullentity login" , :yellow
+                say "run: $ pullentity login your@email" , :magenta
+                exit(1)
               end
             rescue => e
               say "Error, make sure you are inside a pullentity project", :red
@@ -59,6 +63,15 @@ module Pullentity
             end
           end
 
+          def check_for_json_build
+            begin
+              @json_hsh = JSON.parse( IO.read("#{location}/pullentity_build.json") )
+            rescue => e
+              say "error #{e}", :red
+              raise
+            end
+          end
+
           def write_site_in_yaml(site)
             begin
               hsh = YAML.load_file(location + "pullentity.yml")
@@ -82,6 +95,7 @@ module Pullentity
 
           def export_api_call()
             check_for_yaml
+            check_for_json_build
 
             conn = Faraday.new(:url => domain) do |f|
               f.request :multipart
@@ -103,32 +117,32 @@ module Pullentity
           end
 
           def upload_assets()
-            conn = Faraday.new(:url => domain) do |f|
+
+            @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 )
+            {"js" => "javascripts", "css"=>"stylesheets", "images"=> "images", "fonts"=>"fonts"}.each do |k, v|
+              @json_hsh["assets"]["#{k}"].each do |file|
+                say "upload #{k}: #{file}", :magenta
+                upload_file("#{location}/build/assets/#{v}/#{file}", "text/json")
+              end
+            end
 
-            say JSON.parse(response.body)
+          end
 
-            say "upload images", :green
-            images.each do |image|
-              payload = { :file => Faraday::UploadIO.new("#{image}", 'text/json') }
-              response = conn.put("/api/v1/upload_assets?auth_token=#{@token}&subdomain=#{@site}&theme_name=#{@theme_name}", payload )
-              say JSON.parse(response.body)
+          def upload_file(file, mime_type="text/json")
+            payload = { :file => Faraday::UploadIO.new("#{file}", mime_type) }
+            response = @conn.put("/api/v1/upload_assets?auth_token=#{@token}&subdomain=#{@site}&theme_name=#{@theme_name}", payload )
+            status =  JSON.parse(response.body)
+            if status.keys.include?("error")
+              say status["message"], :red
+            else
+              say status["message"], :green
             end
-
           end
 
           def images

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

@@ -62,14 +62,26 @@ module Pullentity
             Dir.foreach(location.join("build/assets/images") ).grep(/.jpg|.jpeg|.png|.gif|.ico/).each do |image|
               images << image
             end
+
             fonts = []
             Dir.foreach(location.join("build/assets/fonts") ).grep(/.eot|.svg|.ttf|.woff/).each do |font|
               fonts << font
             end
+
+            jss = []
+            Dir.foreach(location.join("build/assets/javascripts") ).grep(/.js$/).each do |js|
+              jss << js
+            end
+
+            styles = []
+            Dir.foreach(location.join("build/assets/stylesheets") ).grep(/.css/).each do |css|
+              styles << css
+            end
+
             js      =  File.open(location.join("build/assets/javascripts/application.js")).readlines.join("")
             css = File.open(location.join("build/assets/stylesheets/application.css")).readlines.join("")
 
-            { :images => images , :js => js, :css => css , :fonts=> fonts }
+            { :images => images , :js => jss, :css => styles , :fonts=> fonts }
 
           end
 
@@ -84,7 +96,7 @@ module Pullentity
 
         end
 
-        map %(n) => 'export'
+        map %(ex) => 'export'
         desc "export", "exports a new Pullentity Client project."
         long_desc "Exports a new Pullentity project"
         def export

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

@@ -29,7 +29,7 @@ module Pullentity
         end
 
         #map %(n) => 'select'
-        desc "make_defalt", "needs auth_token."
+        desc "make_default", "needs auth_token."
         long_desc "make default site"
         def make_default
           ::Pullentity::Client::Generate::Exporter.start(['export'])
@@ -37,9 +37,9 @@ module Pullentity
         end
 
         #map %(n) => 'select'
-        desc "make_defalt", "needs auth_token."
+        desc "show theme", "needs auth_token."
         long_desc "make default site"
-        def current
+        def show_theme
           ::Pullentity::Client::Generate::Auth.start(['show_theme'])
         end
 

data/lib/pullentity-client/templates/app/assets/javascripts/application.js.erb

@@ -1,3 +1,4 @@
 
-//= require "pullentity"
+//= require 'config'
+//= require 'pullentity'
 

data/lib/pullentity-client/templates/app/assets/javascripts/config.js.erb

@@ -0,0 +1,6 @@
+
+<% config = YAML.load(File.open("./pullentity.yml")) %>
+window.pullentity_domain = "http://<%= config['site'] %>";
+
+
+

data/lib/pullentity-client/templates/app/assets/stylesheets/customtheme.css.scss

@@ -1,4 +1,5 @@
 @import 'pullentity';
+@import 'bootstrap.min';
 @import "compass";
 
 // Responsive
@@ -17,11 +18,11 @@ h2{
 
 #content h2 {
   font-family: "Helvetica Neue",Helvetica,"pragmatica-web",Arial,sans-serif;
-  font-size: 57px;
-  font-weight: 700;
-  letter-spacing: -0.04em;
-  line-height: 64px;
-  margin-bottom: 20px;
+  font-size: 58px;
+  font-weight: lighter;
+  letter-spacing: 0.01em;
+  line-height: 60px;
+  margin-bottom: 39px;
 }
 
 #loader{
@@ -34,6 +35,7 @@ h2{
   float: left;
   list-style: none outside none;
   margin: 0 0 7px;
+  padding:0px;
  li{
   /*float:left;*/
   margin:5px;
@@ -59,6 +61,10 @@ h2{
   a:focus { outline: none; }
 }
 
+ul{
+  padding: 0;
+}
+
 #sidebar {
   background: none repeat scroll 0 0 #FFFFFF;
   border-right: 1px solid #BBBBBB;
@@ -93,7 +99,7 @@ h2{
 }
 
 #content {
-  margin:16px 0 50px 260px;
+  margin:16px 0 50px 225px;
   position: relative;
   width: 750px;
   @media screen and (max-width: $break-small) {
@@ -110,8 +116,8 @@ h2{
 
   p{
     font-family: Georgia,Times,"Times New Roman",serif;
-    font-size: 26px;
-    font-weight: 400;
+    font-size: 22px;
+    //font-weight: 400;
     line-height: 39px;
     margin-bottom: 40px;
   }

data/lib/pullentity-client/templates/app/index.html.haml

@@ -1,12 +1,14 @@
 
+
+
 = content_for :principal do
 
   - theme_list = Dir.foreach(Dir.pwd + ("/source/views/themes") ).grep(/.haml/)
 
   - theme_list.each do |o|
-    %script{ type: "template/text", id: "#{o.gsub(".haml", "")}", class: "pullentity-themes"}
-      %div{ id: "#{o.gsub(".haml", "")}", style: "display:none"}
+    %script{ type: "text/x-handlebars-template", id: "#{o.gsub(".haml", "")}", class: "pullentity-themes"}
+      %div{ id: "#{o.gsub(".haml", "")}" }
         = partial "views/themes/#{o.gsub(".haml", "")}"
 
-  %script{ type: "template/text", id: "list", class: "pullentity-themes"}
+  %script{ type: "text/x-handlebars-template", id: "list", class: "pullentity-themes"}
     = partial "views/list"

data/lib/pullentity-client/templates/app/views/list.haml

@@ -1,13 +1,13 @@
 %h2 {{section.title}}´s projects
 
 %ul.thumbnails
-  {{#projects}}
+  {{#each projects}}
   %li.span3
     .thumbnail
-      %a{ :href=>"{{project_path}}" }
-        %img{:alt => "{{title}}", :src => "{{project_photo}}"}/
+      %a{ :href=> "{{ProjectUrl this}}" }
+        %img{ :alt => "{{title}}", :src => "{{ProjectImg 'url'}}" }
       .caption
         %h5
-          %a.pjax{:href => "{{project_path}}"} {{title}}
-        %p
-  {{/projects}}
+          %a.pjax{:href => "{{ProjectUrl this}}"} {{ title }}
+
+  {{/each}}

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

@@ -1,16 +1,16 @@
-%script{ type: "template/text", id: "layout"}
+%script{ type: "text/x-handlebars-template", id: "layout"}
 
   #sidebar
     %h2
-      %a.pjax{:href => "{{site_link}}"}{{site.name}}
+      %a.pjax{:href => ""} {{name}}
 
     %ul#menu
-      {{#sections}}
+      {{#each sections}}
       {{#show_in_menu}}
       %li
-        %a.pjax{:href => "{{public_url}}"} {{title}}
+        %a{:href => "{{SectionUrl this}}"} {{title}}
       {{/show_in_menu}}
-      {{/sections}}
+      {{/each}}
 
   #content.row-fluid{"data-pjax-container" => ""}
     / Don't remove this line

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

@@ -3,18 +3,10 @@
 %meta{:content => "t", :name => "keywords"}
 %meta{:content => "INDEX,FOLLOW", :name => "ROBOTS"}
 
-%link{:href => "http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css", :rel => "stylesheet"}
-%script{:src => "http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js"}
 %script{:src => "https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"}
-%script{:src => "https://raw.github.com/desandro/masonry/master/jquery.masonry.min.js"}
-%script{:src => "http://malsup.github.com/jquery.cycle.all.js"}
-%script{:src => "https://raw.github.com/defunkt/jquery-pjax/master/jquery.pjax.js"}
 %script{:src => "https://raw.github.com/brandonaaron/livequery/master/jquery.livequery.js"}
 
 = javascript_include_tag "application"
 = stylesheet_link_tag "application"
 
-= test_data_include_tag
-
-= yield_content(:application_js)
-
+= yield_content(:application_js)

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

@@ -3,9 +3,6 @@
 
   $(function() {
 
-    $.pjax.defaults.timeout = 5000;
-    $('a.pjax').pjax('[data-pjax-container]');
-
     function onAfter(curr, next, opts) {
       var index = opts.currSlide;
       //$('#prev')[index == 0 ? 'hide' : 'show']();

data/lib/pullentity-client/templates/app/views/themes/home.haml

@@ -1,4 +1,3 @@
-
 %h2 {{project.title}}
 
 .myCarousel.carousel.slide

data/lib/pullentity-client/templates/app/views/themes/list-2.haml

@@ -0,0 +1,13 @@
+%h2 {{section.title}}
+
+{{#each projects}}
+.list-project
+
+  %h3
+    %a.pjax{:href => "{{project_path}}"} {{title}}
+
+  %a.thumbnail{:href => "{{project_path}}"}
+    %img{:alt => "{{title}}", :src => "{{ProjectImg 'url'}}"}
+
+  %hr
+{{/each}}

data/lib/pullentity-client/templates/app/views/themes/theme1.haml

@@ -1,17 +1,16 @@
-
-%h2 {{project.title}}
+%h2 {{title}}
 
 .myCarousel.carousel.slide
   .carousel-inner
-    {{#photos}}
+    {{#each photos}}
 
     .item
-      %img{:alt => "", :src => "{{img_large}}"}/
+      %img{:alt => "", :src => "{{PhotoImg 'xlarge'}}"}/
       .carousel-caption
-        %h4 {{title}}
-        %p {{caption}}
+        %h4 {{image.title}}
+        %p {{image.caption}}
 
-    {{/photos}}
+    {{/each}}
 
   %a.left.carousel-control{"data-slide" => "prev", :href => ".myCarousel"} ‹
 
@@ -19,6 +18,6 @@
 
 
 
-%p {{{project.body}}}
+%p {{{ body }}}
 
 {{{fb_comments}}}

data/lib/pullentity-client/version.rb

@@ -1,5 +1,5 @@
 module Pullentity
   module Client
-    VERSION = "0.1.3"
+    VERSION = "0.3.0"
   end
 end

data/spec/pullentity-client/generate/exporter_spec.rb

@@ -8,7 +8,7 @@ describe "Creating of a new Pullentity Client Project" do
 
   context "Directories should be created" do
     before :all do
-      system("cd dailyfocus && bundle exec pullentity export new name")
+      system("cd dailyfocus && bundle exec pullentity theme export")
     end
 
     it "should generate the export build json" do
@@ -17,9 +17,9 @@ describe "Creating of a new Pullentity Client Project" do
 
     it "should be a valid json" do
       json  = JSON.parse( IO.read("dailyfocus/pullentity_build.json") )
-      json["themes"].size.should == 2
+      json["themes"].size.should == 3
       json["theme_name"].should_not be_empty
-      json["theme_name"].should == "name"
+      json["theme_name"].should == "dailyfocus"
       json["layout"].should_not be_empty
       json["list"].should_not be_empty
       json["css"].should_not be_empty