Merge branch '1.1' of github.com:next-l/enju_news into 1.1

Conflicts:
	README.rdoc

.travis.yml

@@ -1,6 +1,27 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
-before_script: "bundle exec rake db:migrate"
+- 1.9.3
+- 2.0.0
+- 2.1.3
+before_script:
+- mysql -e 'create database enju_test'
+- psql -c 'create database enju_test;' -U postgres
+- bundle exec rake db:migrate
+services:
+- redis-server
+gemfile:
+- gemfiles/rails3_2.gemfile
+- gemfiles/rails4_1.gemfile
+env:
+- DB=sqlite
+- DB=mysql
+- DB=postgresql
+matrix:
+  exclude:
+  - rvm: 1.9.3
+    gemfile: gemfiles/rails4_1.gemfile
+  - rvm: 2.1.3
+    gemfile: gemfiles/rails3_2.gemfile
+notifications:
+  slack:
+    secure: aVw4odRuPfoUjOXbmYfwhYrUuG0BPxmPDmpz6RmUoUKUtUDPWeCw60Xxv+AvGxNuc2usZ32eHW/tKXsQukx5SADVYkSgiAquo4/PErxAdt+P+ilEUT0fzJr8N11mtY0SEOK1iXVp5ucjswsjUYPyQwcddL/hBU2tcSU73yrLv2E=

app/models/news_feed.rb

@@ -1,6 +1,6 @@
 class NewsFeed < ActiveRecord::Base
   attr_accessible :title, :url
-  default_scope order: "news_feeds.position"
+  default_scope { order("news_feeds.position") }
   belongs_to :library_group, validate: true
 
   validates_presence_of :title, :url, :library_group
@@ -16,9 +16,7 @@ def self.per_page
 
   def fetch
     begin
-      feed = open(url) do |f|
-        f.read
-      end
+      feed = Faraday.get(url).body
       if rss = RSS::Parser.parse(feed, false)
         self.body = feed
       end

app/models/news_post.rb

@@ -1,7 +1,7 @@
 class NewsPost < ActiveRecord::Base
   attr_accessible :title, :body
-  scope :published, where(draft: false)
-  default_scope order('news_posts.start_date DESC')
+  scope :published, -> { where(draft: false) }
+  default_scope { order('news_posts.start_date DESC') }
   belongs_to :user
   belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id', validate: true
 

enju_news.gemspec

@@ -14,18 +14,20 @@ Gem::Specification.new do |s|
   s.description = "News article management for Next-L Enju"
 
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
-  s.test_files = Dir["spec/**/*"] - Dir["spec/dummy/log/*"]
+  s.test_files = Dir["spec/**/*"] - Dir["spec/dummy/log/*"] - Dir["spec/dummy/solr/{data,pids,default,development,test}/*"] - Dir["spec/dummy/tmp/*"]
 
   s.add_dependency "enju_seed", "~> 0.1.1.pre11"
+  s.add_dependency "faraday"
 
-  s.add_development_dependency "rails", "~> 3.2.19"
   s.add_development_dependency "sqlite3"
-  s.add_development_dependency "rspec-rails", "~> 3.0"
+  s.add_development_dependency "mysql2"
+  s.add_development_dependency "pg"
+  s.add_development_dependency "rspec-rails", "~> 3.1"
   s.add_development_dependency "factory_girl_rails"
   s.add_development_dependency "vcr"
-  s.add_development_dependency "fakeweb"
+  s.add_development_dependency "webmock"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "annotate"
   s.add_development_dependency "sunspot-rails-tester"
-  s.add_development_dependency "enju_leaf", "~> 1.1.0.rc14"
+  s.add_development_dependency "enju_leaf", "~> 1.1.0.rc15"
 end

gemfiles/rails3_2.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 3.2.19"
+gem "jquery-rails"
+gem 'coveralls', require: false
+
+gemspec path: "../"

gemfiles/rails4_1.gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.6"
+gem "jquery-rails"
+gem "protected_attributes"
+gem 'coveralls', require: false
+
+gemspec path: "../"

lib/enju_news/engine.rb

@@ -1,4 +1,5 @@
 require 'enju_seed'
+require 'faraday'
 
 module EnjuNews
   class Engine < ::Rails::Engine

lib/enju_news/version.rb

@@ -1,3 +1,3 @@
 module EnjuNews
-  VERSION = "0.1.0.pre7"
+  VERSION = "0.1.0.pre8"
 end