fuel 0.3.22 → 0.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d92d0d5ad55c1d570ec773365cb797443132eb82
-  data.tar.gz: 0916c94b1e4892e76bb9dcdeaca580a0fe02d074
+  metadata.gz: 62060296c0ba614342471200beaa58af5cf7eb8c
+  data.tar.gz: 8f033712ddb57da8513cf10a29fbd01fa7f0d489
 SHA512:
-  metadata.gz: c37c873ff701c0dd1c62776db9e285f55af854803facab0383f90e841e74213f8cb305cf9bd8d4d2b14b3c870e5d1af84e472a4fc967174267285a22ff641af5
-  data.tar.gz: f12aab0950beee7594802c3875e932a00d98d4494f63ef1527a7c47dbaf2bf8740688fc093dd6fb9c51f25e0c2086f7178bdfbcad310d2f9153132e0f180c216
+  metadata.gz: f8f900dfc2630664711d737582a1d59dd5bd97dc656e61653fcf428e98e0afce46ef97f3046b0dab923f713763654ab90f5cb15efd07790f06ee6a187fccaa2c
+  data.tar.gz: eeb434e558cc73ed1f884c070ea7398b98dc774d059ee676b40dbf368ac66fa553b2203a04b2c8f37df16c04d99a0f5f0980818bbb1e62210aac475544670843

data/app/controllers/fuel/admin/authors_controller.rb

@@ -15,8 +15,8 @@ module Fuel
 
       def create
         @params_hash = Rails.version[0].to_i < 4 ? params[:fuel_author] : author_params
-        @author = Fuel::Author.new(@params_hash)
         set_start_date
+        @author = Fuel::Author.new(@params_hash)
 
         if @author.save
           redirect_to fuel.admin_authors_path, notice: "Your author was successfully #{@message}."
@@ -31,8 +31,8 @@ module Fuel
 
       def update
         @params_hash = Rails.version[0].to_i < 4 ? params[:fuel_author] : author_params
-        @author.attributes = @params_hash
         set_start_date
+        @author.attributes = @params_hash
 
         if @author.save
           redirect_to fuel.admin_authors_path, notice: "Author was updated and #{@message}"
@@ -57,8 +57,8 @@ module Fuel
 
         def set_start_date
           start_date_string = @params_hash[:start_date]
-          start_datetime = DateTime.strptime(start_date_string, "%m/%d/%Y")
-          @author.start_date = start_datetime if start_datetime
+          start_datetime = start_date_string.present? ? DateTime.strptime(start_date_string, "%m/%d/%Y") : nil
+          @params_hash[:start_date] = start_datetime
         end
 
         def author_params

data/app/controllers/fuel/admin/posts_controller.rb

@@ -15,8 +15,9 @@ module Fuel
 
       def create
         @params_hash = Rails.version[0].to_i < 4 ? params[:fuel_post] : post_params
+        update_published_at
         @post = Fuel::Post.new(@params_hash)
-        update_published
+        set_message
 
         if @post.save
           redirect_to fuel.admin_posts_path, notice: "Your blog post was successfully #{@message}."
@@ -31,8 +32,9 @@ module Fuel
 
       def update
         @params_hash = Rails.version[0].to_i < 4 ? params[:fuel_post] : post_params
+        update_published_at
         @post.attributes = @params_hash
-        update_published
+        set_message
 
         if @post.save
           redirect_to fuel.edit_admin_post_path(@post), notice: "Post was updated and #{@message}"
@@ -62,10 +64,13 @@ module Fuel
           params.require(:fuel_post).permit(:tag, :author_id, :content, :title, :teaser, :featured_image, :published, :published_at)
         end
 
-        def update_published
+        def update_published_at
           published_at_string = @params_hash[:published_at]
           published_at_datetime = DateTime.strptime(published_at_string, "%m/%d/%Y")
-          @post.published_at = published_at_datetime if published_at_datetime
+          @params_hash[:published_at] = published_at_datetime
+        end
+
+        def set_message
           @message = @post.published ? "posted" : "saved"
         end
 

data/lib/blog_importer.rb

@@ -25,10 +25,12 @@ class BlogImporter
     parsed_json.each do |post|
       puts "Importing #{post['title']}"
       post.delete("id")
-      author_name = post["author"].dup
+      author_first_name = post["author"]["first_name"]
+      author_last_name = post["author"]["last_name"]
+      author_full_name = "#{author_first_name} #{author_last_name}"
       image_url = post["prioritized_featured_image_url"].present? ? post["prioritized_featured_image_url"].dup : nil
       post.delete("prioritized_featured_image_url")
-      member = author_name_to_member[author_name]
+      member = author_name_to_member[author_full_name]
       author = Fuel::Author.find_by_email(member[:email])
       post["author_id"] = author.id
       post.delete("author")
@@ -42,21 +44,19 @@ class BlogImporter
 
   def author_name_to_member
     @key_to_member ||= {
-      "BH" => ExampleAuthor::BRENDAN,
-      "Brendan" => ExampleAuthor::BRENDAN,
-      "Tom" => ExampleAuthor::TOM,
-      "TC" => ExampleAuthor::TOM,
-      "Ryan" => ExampleAuthor::RYAN,
-      "Scott" => ExampleAuthor::SCOTT,
-      "Kurt" => ExampleAuthor::KURT,
-      "Katie" => ExampleAuthor::KATIE,
-      "Scott " => ExampleAuthor::SCOTT,
-      "Monique" => ExampleAuthor::MONIQUE,
-      "Jack " => ExampleAuthor::JACK,
-      "Dave" => ExampleAuthor::DAVE
+      "Brendan Hennessy" => Fuel::Author.find_by_email("brendan@launchpadlab.com"),
+      "Tom Cullen" => Fuel::Author.find_by_email("tom@launchpadlab.com"),
+      "Ryan Francis" => Fuel::Author.find_by_email("ryan@launchpadlab.com"),
+      "Scott Weisman" => Fuel::Author.find_by_email("scott@launchpadlab.com"),
+      "Kurt Cunningham" => Fuel::Author.find_by_email("kurt@launchpadlab.com"),
+      "Katie Astrauskas" => Fuel::Author.find_by_email("katie@launchpadlab.com"),
+      "Monique Marchwiany" => Fuel::Author.find_by_email("monique@launchpadlab.com"),
+      "Jack Miller" => Fuel::Author.find_by_email("jack@launchpadlab.com"),
+      "Dave Corwin" => Fuel::Author.find_by_email("dave@launchpadlab.com")
     }
   end
 
+
   def create_authors
     [ExampleAuthor::BRENDAN, ExampleAuthor::TOM, ExampleAuthor::RYAN, ExampleAuthor::SCOTT, ExampleAuthor::KURT, ExampleAuthor::DAVE, ExampleAuthor::KATIE, ExampleAuthor::MONIQUE, ExampleAuthor::JACK].each do |member_const|
       member = member_const.dup

data/lib/fuel/version.rb

@@ -1,3 +1,3 @@
 module Fuel
-  VERSION = "0.3.22"
+  VERSION = "0.3.23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuel
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.23
 platform: ruby
 authors:
 - Ryan Francis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails