atreides 2.0.3 → 2.0.4

data/lib/atreides.rb

@@ -47,9 +47,11 @@ require "delayed_job"
 require 'mini_fb'
 
 [ 'atreides/configuration',
+  'atreides/schema',
   'atreides/extendable',
   'atreides/validators',
   'atreides/time_formats',
+  'atreides/time_zone',
   "atreides/i18n_helpers",
   'atreides/base/base',
   'atreides/base/taggable',
@@ -59,6 +61,8 @@ require 'mini_fb'
   require File.expand_path(path, File.dirname(__FILE__))
 end
 
+include Atreides::Schema
+
 module Atreides
   class << self
 

data/lib/atreides/schema.rb

@@ -0,0 +1,53 @@
+module Atreides
+  module Schema
+    COLUMNS = {:published_at  => :datetime,
+               :state         => :string,
+               :time_zone      => :string }
+
+
+     def self.included(base)
+       ActiveRecord::ConnectionAdapters::Table.send :include, TableDefinition
+       ActiveRecord::ConnectionAdapters::TableDefinition.send :include, TableDefinition
+       ActiveRecord::ConnectionAdapters::AbstractAdapter.send :include, Statements
+
+       if defined?(ActiveRecord::Migration::CommandRecorder) # Rails 3.1+
+         ActiveRecord::Migration::CommandRecorder.send :include, CommandRecorder
+       end
+     end
+
+
+    module Statements
+      def add_publishable(table_name)
+        COLUMNS.each_pair do |column_name, column_type|
+          add_column(table_name, column_name, column_type)
+        end
+      end
+
+      def remove_publishable(table_name)
+        COLUMNS.each_pair do |column_name, column_type|
+          remove_column(table_name, column_name)
+        end
+      end
+    end
+
+    module TableDefinition
+      def publishable()
+        COLUMNS.each_pair do |column_name, column_type|
+          column(column_name, column_type)
+        end
+      end
+    end
+
+    module CommandRecorder
+      def add_publishable(*args)
+        record(:add_publishable, args)
+      end
+
+      private
+
+      def invert_add_publishable(args)
+        [:remove_publishable, args]
+      end
+    end
+  end
+end

data/lib/atreides/time_zone.rb

@@ -0,0 +1,6 @@
+module Atreides
+  module TimeZone
+    DEFAULT = "Eastern Time (US & Canada)".freeze
+    ZONES = ["Eastern Time (US & Canada)"]
+  end
+end

data/lib/atreides/version.rb

@@ -1,4 +1,4 @@
 # Version string of the Atreides engine
 module Atreides
-  VERSION = "2.0.3".freeze
+  VERSION = "2.0.4".freeze
 end

data/lib/generators/templates/create_pages.rb

@@ -4,8 +4,7 @@ class CreatePages < ActiveRecord::Migration
       t.string :title
       t.text :body
       t.string :slug
-      t.datetime :published_at
-      t.string :state
+      t.publishable
       t.timestamps
 
       t.integer :likes_count, :default => 0

data/lib/generators/templates/create_posts.rb

@@ -5,8 +5,7 @@ class CreatePosts < ActiveRecord::Migration
       t.string :title
       t.text :body
       t.string :slug
-      t.datetime :published_at
-      t.string :state
+      t.publishable
       t.timestamps
       t.integer :tumblr_id, :limit => 8 # BigInt because new tumblr ids are longer
       t.integer :likes_count, :default => 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atreides
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -480,17 +480,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -498,7 +498,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -506,7 +506,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rack-fiber_pool
   requirement: !ruby/object:Gem::Requirement
@@ -1106,6 +1106,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/assets/flash/atreides/player.swf
+- lib/assets/flash/atreides/slideshowpro.swf
+- lib/assets/flash/atreides/swfupload.swf
 - lib/assets/images/atreides/admin/add.png
 - lib/assets/images/atreides/admin/add_btn.png
 - lib/assets/images/atreides/admin/add_dashboard.png
@@ -1171,8 +1174,144 @@ files:
 - lib/assets/images/atreides/blank.gif
 - lib/assets/images/atreides/closelabel.png
 - lib/assets/images/atreides/loading.gif
+- lib/assets/images/atreides/share/aim_16.png
+- lib/assets/images/atreides/share/apple_16.png
+- lib/assets/images/atreides/share/bebo_16.png
+- lib/assets/images/atreides/share/blogger_16.png
+- lib/assets/images/atreides/share/brightkite_16.png
+- lib/assets/images/atreides/share/cargo_16.png
+- lib/assets/images/atreides/share/delicious_16.png
+- lib/assets/images/atreides/share/designfloat_16.png
+- lib/assets/images/atreides/share/designmoo_16.png
+- lib/assets/images/atreides/share/deviantart_16.png
+- lib/assets/images/atreides/share/digg_16.png
+- lib/assets/images/atreides/share/digg_alt_16.png
+- lib/assets/images/atreides/share/dopplr_16.png
+- lib/assets/images/atreides/share/dribbble_16.png
+- lib/assets/images/atreides/share/email_16.png
+- lib/assets/images/atreides/share/ember_16.png
+- lib/assets/images/atreides/share/evernote_16.png
+- lib/assets/images/atreides/share/facebook_16.png
+- lib/assets/images/atreides/share/flickr_16.png
+- lib/assets/images/atreides/share/friendfeed_16.png
+- lib/assets/images/atreides/share/gamespot_16.png
+- lib/assets/images/atreides/share/google_16.png
+- lib/assets/images/atreides/share/google_voice_16.png
+- lib/assets/images/atreides/share/google_wave_16.png
+- lib/assets/images/atreides/share/googletalk_16.png
+- lib/assets/images/atreides/share/gowalla_16.png
+- lib/assets/images/atreides/share/grooveshark_16.png
+- lib/assets/images/atreides/share/ilike_16.png
+- lib/assets/images/atreides/share/komodomedia_azure_16.png
+- lib/assets/images/atreides/share/komodomedia_wood_16.png
+- lib/assets/images/atreides/share/lastfm_16.png
+- lib/assets/images/atreides/share/license.txt
+- lib/assets/images/atreides/share/linkedin_16.png
+- lib/assets/images/atreides/share/mixx_16.png
+- lib/assets/images/atreides/share/mobileme_16.png
+- lib/assets/images/atreides/share/mynameise_16.png
+- lib/assets/images/atreides/share/myspace_16.png
+- lib/assets/images/atreides/share/netvibes_16.png
+- lib/assets/images/atreides/share/newsvine_16.png
+- lib/assets/images/atreides/share/openid_16.png
+- lib/assets/images/atreides/share/orkut_16.png
+- lib/assets/images/atreides/share/pandora_16.png
+- lib/assets/images/atreides/share/paypal_16.png
+- lib/assets/images/atreides/share/picasa_16.png
+- lib/assets/images/atreides/share/plurk_16.png
+- lib/assets/images/atreides/share/posterous_16.png
+- lib/assets/images/atreides/share/qik_16.png
+- lib/assets/images/atreides/share/readernaut_16.png
+- lib/assets/images/atreides/share/reddit_16.png
+- lib/assets/images/atreides/share/roboto_16.png
+- lib/assets/images/atreides/share/rss_16.png
+- lib/assets/images/atreides/share/sharethis_16.png
+- lib/assets/images/atreides/share/skype_16.png
+- lib/assets/images/atreides/share/stumbleupon_16.png
+- lib/assets/images/atreides/share/technorati_16.png
+- lib/assets/images/atreides/share/tumblr_16.png
+- lib/assets/images/atreides/share/twitter_16.png
+- lib/assets/images/atreides/share/viddler_16.png
+- lib/assets/images/atreides/share/vimeo_16.png
+- lib/assets/images/atreides/share/virb_16.png
+- lib/assets/images/atreides/share/windows_16.png
+- lib/assets/images/atreides/share/wordpress_16.png
+- lib/assets/images/atreides/share/xing_16.png
+- lib/assets/images/atreides/share/yahoo_16.png
+- lib/assets/images/atreides/share/yahoobuzz_16.png
+- lib/assets/images/atreides/share/yelp_16.png
+- lib/assets/images/atreides/share/youtube_16.png
 - lib/assets/images/atreides/sprite.png
 - lib/assets/images/atreides/tipsy.gif
+- lib/assets/javascripts/atreides/facebox.js
+- lib/assets/javascripts/atreides/fileuploader.js
+- lib/assets/javascripts/atreides/galleria/src/galleria.js
+- lib/assets/javascripts/atreides/galleria/src/plugins/galleria.flickr.js
+- lib/assets/javascripts/atreides/galleria/src/plugins/galleria.history.js
+- lib/assets/javascripts/atreides/galleria/src/themes/classic/classic-loader.gif
+- lib/assets/javascripts/atreides/galleria/src/themes/classic/classic-map.png
+- lib/assets/javascripts/atreides/galleria/src/themes/classic/galleria.classic.css
+- lib/assets/javascripts/atreides/galleria/src/themes/classic/galleria.classic.js
+- lib/assets/javascripts/atreides/galleria/src/themes/fullscreen/b.png
+- lib/assets/javascripts/atreides/galleria/src/themes/fullscreen/down.gif
+- lib/assets/javascripts/atreides/galleria/src/themes/fullscreen/fix.gif
+- lib/assets/javascripts/atreides/galleria/src/themes/fullscreen/fullscreen-demo.html
+- lib/assets/javascripts/atreides/galleria/src/themes/fullscreen/galleria.fullscreen.css
+- lib/assets/javascripts/atreides/galleria/src/themes/fullscreen/galleria.fullscreen.js
+- lib/assets/javascripts/atreides/galleria/src/themes/fullscreen/i.png
+- lib/assets/javascripts/atreides/galleria/src/themes/fullscreen/l.gif
+- lib/assets/javascripts/atreides/galleria/src/themes/fullscreen/l2.png
+- lib/assets/javascripts/atreides/galleria/src/themes/fullscreen/loader.gif
+- lib/assets/javascripts/atreides/galleria/src/themes/fullscreen/n.gif
+- lib/assets/javascripts/atreides/galleria/src/themes/fullscreen/p.gif
+- lib/assets/javascripts/atreides/galleria/src/themes/fullscreen/r.gif
+- lib/assets/javascripts/atreides/galleria/src/themes/fullscreen/r2.png
+- lib/assets/javascripts/atreides/galleria/src/themes/fullscreen/up.gif
+- lib/assets/javascripts/atreides/galleria.js
+- lib/assets/javascripts/atreides/jquery.autogrow.js
+- lib/assets/javascripts/atreides/jquery.cookie.js
+- lib/assets/javascripts/atreides/jquery.countdown.js
+- lib/assets/javascripts/atreides/jquery.cycle.js
+- lib/assets/javascripts/atreides/jquery.easing.1.3.js
+- lib/assets/javascripts/atreides/jquery.flash.js
+- lib/assets/javascripts/atreides/jquery.iphone-checkboxes.js
+- lib/assets/javascripts/atreides/jquery.jBreadCrumb.1.1.js
+- lib/assets/javascripts/atreides/jquery.multipleselectbox-min.js
+- lib/assets/javascripts/atreides/jquery.multipleselectbox.js
+- lib/assets/javascripts/atreides/jquery.swfupload.js
+- lib/assets/javascripts/atreides/jquery.tipsy.js
+- lib/assets/javascripts/atreides/jquery.uniform.js
+- lib/assets/javascripts/atreides/jtags.js
+- lib/assets/javascripts/atreides/raphael-min.js
+- lib/assets/javascripts/atreides/raphael.analytics.js
+- lib/assets/javascripts/atreides/raphael.path.methods.js
+- lib/assets/javascripts/atreides/raphael.pie.js
+- lib/assets/javascripts/atreides/sifr.js
+- lib/assets/javascripts/atreides/swfobject.js
+- lib/assets/javascripts/atreides/swfupload/handlers.js
+- lib/assets/javascripts/atreides/swfupload/swfupload.cookies.js
+- lib/assets/javascripts/atreides/swfupload/swfupload.js
+- lib/assets/javascripts/atreides/swfupload/swfupload.queue.js
+- lib/assets/javascripts/atreides/swfupload/swfupload.speed.js
+- lib/assets/javascripts/atreides/swfupload/swfupload.swfobject.js
+- lib/assets/javascripts/atreides/underscore-1.1.6.js
+- lib/assets/stylesheets/atreides/admin_grid.css
+- lib/assets/stylesheets/atreides/facebox.css
+- lib/assets/stylesheets/atreides/formtastic.css
+- lib/assets/stylesheets/atreides/galleria.css
+- lib/assets/stylesheets/atreides/ie.css
+- lib/assets/stylesheets/atreides/images/bg_fallback.png
+- lib/assets/stylesheets/atreides/images/icon_sprite.png
+- lib/assets/stylesheets/atreides/images/progress_bar.gif
+- lib/assets/stylesheets/atreides/images/slider_handles.png
+- lib/assets/stylesheets/atreides/images/ui-icons_222222_256x240.png
+- lib/assets/stylesheets/atreides/images/ui-icons_454545_256x240.png
+- lib/assets/stylesheets/atreides/jquery-ui.css
+- lib/assets/stylesheets/atreides/multipleselectbox.css
+- lib/assets/stylesheets/atreides/print.css
+- lib/assets/stylesheets/atreides/public_grid.css
+- lib/assets/stylesheets/atreides/tipsy.css
+- lib/assets/stylesheets/atreides/uniform.default.css
 - lib/atreides/base/aasmstates.rb
 - lib/atreides/base/base.rb
 - lib/atreides/base/taggable.rb
@@ -1182,7 +1321,9 @@ files:
 - lib/atreides/extendable.rb
 - lib/atreides/i18n_helpers.rb
 - lib/atreides/railties/tasks.rake
+- lib/atreides/schema.rb
 - lib/atreides/time_formats.rb
+- lib/atreides/time_zone.rb
 - lib/atreides/validators.rb
 - lib/atreides/version.rb
 - lib/atreides.rb
@@ -1299,7 +1440,7 @@ files:
 - app/models/atreides/page.rb
 - app/models/atreides/photo.rb
 - app/models/atreides/post.rb
-- app/models/atreides/preferences.rb
+- app/models/atreides/preference.rb
 - app/models/atreides/product.rb
 - app/models/atreides/site.rb
 - app/models/atreides/size.rb
@@ -1313,6 +1454,7 @@ files:
 - app/models/tumblr_post_publisher_job.rb
 - app/models/tw_post_publisher_job.rb
 - app/views/admin/_edit_head_content.html.haml
+- app/views/admin/atreides/common/_sidebar_publish.html.haml
 - app/views/admin/atreides/content_parts/_form.html.haml
 - app/views/admin/atreides/content_parts/_photos.html.haml
 - app/views/admin/atreides/content_parts/_text.html.haml
@@ -1362,10 +1504,10 @@ files:
 - app/views/admin/atreides/videos/create.js.haml
 - app/views/admin/atreides/videos/destroy.js.haml
 - app/views/admin/common/_archive_sidebar.html.haml
-- app/views/admin/common/_list_table.html.erb
-- app/views/admin/common/_list_table_row.html.erb
-- app/views/admin/common/_pagination.html.erb
-- app/views/admin/common/_search_form.html.erb
+- app/views/admin/common/_list_table.html.haml
+- app/views/admin/common/_list_table_row.html.haml
+- app/views/admin/common/_pagination.html.haml
+- app/views/admin/common/_search_form.html.haml
 - app/views/admin/common/access_denied.html.haml
 - app/views/atreides/admin/_content_nav.html.haml
 - app/views/atreides/admin_home/_analytics.html.haml

data/app/views/admin/common/_list_table.html.erb

@@ -1,37 +0,0 @@
-<%
-records ||= []
-class_obj ||= records.first.class
-record_name = class_obj.to_s.underscore
-ignore_cols ||= []
-ignore_cols.uniq!
-action_cols ||= %w(show edit destroy)
-nosort_cols ||= []
-list_cols ||= class_obj.column_names
-cols_hash = class_obj.columns_hash
-%>
-<table id="<%= record_name.pluralize.parameterize('_') %>_list_<%= records.object_id %>" class="remote_sort_table sort_table <%= record_name.pluralize.parameterize('_') %>_table" cellspacing="0" cellpadding="0">
-  <thead>
-    <tr>
-    <%
-    list_cols.each do |col|
-      next if cols_hash[col] and cols_hash[col].primary
-      next if ignore_cols.include?(col)
-      field_func = "#{col}_column"
-      label_func = "#{col}_label"
-    %>
-      <th class="<%= sort_col(cols_hash[col]) %> <%= "sort#{params[:dir]}" if params[:sort]==col %> <%= "sortcol" unless nosort_cols.include?(col) %>">
-        <%= self.respond_to?(label_func) ? send(label_func, col) : ttt(col.to_s) %>
-      </th>
-    <% end %>
-    <% unless action_cols.empty? %>
-      <th class="nosort actions" colspan="<%= action_cols.size %>"><%= image_tag "atreides/blank.gif" %></th>
-    <% end %>
-    </tr>
-  </thead>
-  <tbody>
-    <%= render :partial => 'admin/common/list_table_row', :collection => records, :as => :record, :locals => { :list_cols => list_cols, :cols_hash => cols_hash, :ignore_cols => ignore_cols, :action_cols => action_cols, :record_name => record_name } %>
-  </tbody>
-</table>
-<p class="pagination">
-  <%= will_paginate records if records.respond_to? :total_pages %>
-</p>

data/app/views/admin/common/_list_table_row.html.erb

@@ -1,18 +0,0 @@
-<tr class="<%= cycle 'even','odd' -%>" id="<%= record.dom_id('tablerow') -%>">
-  <% list_cols.each do |col|
-    next if cols_hash[col] and cols_hash[col].primary
-    next if ignore_cols.include?(col)
-    field_func = "#{col}_column"
-   %>
-  <td class="<%= field_func %>">
-    <%= content_tag(:span, (self.respond_to?(field_func) ? send(field_func, record) : record.send(col))) %>
-  </td>
-  <% end %>
-  <% action_cols.each do |action|
-    action_func = "#{action}_link"
-    %>
-  <td class="action_link">
-    <%= self.respond_to?(action_func) ? send(action_func, record) : action_link(action, record, record_name) %>
-  </td>
-  <% end %>
-</tr>

data/app/views/admin/common/_pagination.html.erb

@@ -1 +0,0 @@
-<%= will_paginate collection, :container => false, :inner_window => 2, :outer_window => 1, :params => {:query => params[:query]} %>

data/app/views/admin/common/_search_form.html.erb

@@ -1,6 +0,0 @@
-<div class="search-form" style="float:right;clear:none;margin-left:0.5em;">
-  <%= form_tag "", :method => "get", :class => "auto-hide-text" do %>
-  <%= link_to ttt(:'.reset'), url_for(:controller => params[:controller], :action => controller.action_name), :class => "submit_btn", :style => "float:right;clear:none;margin-left:0.5em;" %>
-  <%= text_field_tag :search, (params[:search] || "Search...") %>
-  <% end %>
-</div>