c80_contest 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b67512c64a0116f899791b232453e32c48fc92ec
-  data.tar.gz: b9403eff035448dc0de9302796d4dbe3d1da76db
+  metadata.gz: e1e0d9110a81f4e649d7e7b39ae5cb91726ed2d1
+  data.tar.gz: f7e602e7497286134e8f00eb8e79b5801bb0a582
 SHA512:
-  metadata.gz: 9dbe501af079144e075ec2c2a4ae824aa0e7e2eac9d15da047d37d105bef428ea9177c0c3b4ba30bfa9dac740687d93f8be8738baee59e88baff59f30258b22c
-  data.tar.gz: 5aa1e8fb39f208fee91bec4d783c5d7f237851ba10c62f5a7093da6bf9b3164dde9deb7b3d50dd981657b85ac76b6a464962a27b1f2fe012023d614955f7355c
+  metadata.gz: 3dd4f431f6bbc7ec360b60fa640f7ec2837ffdf4603618ae5ddada817092fd92661795097103f1d3c9b46a90c908e3566f6c184fe3d8544266204b9b0d856284
+  data.tar.gz: '06194298a22aeb03e06b0f6ef9b5a15cbd8e0dbd9e4fc771ea0e730535643d1898add924aa6bf0ce8f92cee296e57e782692853e56e6ac4e5d7559915a1cf2af'

data/.gitignore

@@ -14,4 +14,5 @@
 .rspec_status
 .env
 *.log
-.byebug_history
+.byebug_history
+.zeus.sock

data/Gemfile

@@ -1,4 +1,37 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in c80_contest.gemspec
 gemspec
+
+group :development, :test do
+
+  # You need these
+  gem 'rspec-rails'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-zeus'
+  gem 'guard-bundler'
+
+  gem 'factory_girl_rails'
+
+  # You don't need these, but I use them
+  # gem 'rb-fsevent'
+  gem 'ffaker'
+  # gem 'pry'
+
+end
+
+group :development do
+  # You don't need these, but I use them
+  # gem 'better_errors'
+  gem 'awesome_print'
+  # gem 'brakeman'
+end
+
+group :test do
+  # You don't need these, but I use them
+  # gem 'vcr'
+  # gem 'webmock'
+  gem 'capybara'
+  # gem 'simplecov', require: false
+end

data/Guardfile

@@ -0,0 +1,59 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+guard 'zeus' do
+  require 'ostruct'
+
+  rspec = OpenStruct.new
+  rspec.spec_dir = 'spec'
+  rspec.spec = ->(m) { "#{rspec.spec_dir}/#{m}_spec.rb" }
+  rspec.spec_helper = "#{rspec.spec_dir}/spec_helper.rb"
+
+  # matchers
+  rspec.spec_files = /^#{rspec.spec_dir}\/.+_spec\.rb$/
+
+  # Ruby apps
+  ruby = OpenStruct.new
+  ruby.lib_files = /^(lib\/.+)\.rb$/
+
+  watch(rspec.spec_files)
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(ruby.lib_files) { |m| rspec.spec.call(m[1]) }
+
+  # Rails example
+  rails = OpenStruct.new
+  rails.app_files = /^app\/(.+)\.rb$/
+  rails.views_n_layouts = /^app\/(.+(?:\.erb|\.haml|\.slim))$/
+  rails.controllers = %r{^app/controllers/(.+)_controller\.rb$}
+
+  watch(rails.app_files) { |m| rspec.spec.call(m[1]) }
+  watch(rails.views_n_layouts) { |m| rspec.spec.call(m[1]) }
+  watch(rails.controllers) do |m|
+    [
+      rspec.spec.call("routing/#{m[1]}_routing"),
+      rspec.spec.call("controllers/#{m[1]}_controller"),
+      rspec.spec.call("acceptance/#{m[1]}")
+    ]
+  end
+
+  # TestUnit
+  # watch(%r|^test/(.*)_test\.rb$|)
+  # watch(%r|^lib/(.*)([^/]+)\.rb$|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+  # watch(%r|^test/test_helper\.rb$|)    { "test" }
+  # watch(%r|^app/controllers/(.*)\.rb$|) { |m| "test/functional/#{m[1]}_test.rb" }
+  # watch(%r|^app/models/(.*)\.rb$|)      { |m| "test/unit/#{m[1]}_test.rb" }
+end

data/README.md

@@ -110,4 +110,6 @@ div#lo {
 * [ ] Проверить, удаляются ли окна из html, когда их закрываем или когда они сами исчезают
 * [ ] Вывести в настройки размер кнопки-картинки, использовать их в uploader-е и в css прелоадера
 * [ ] Дописать тесты
-* [ ] Допилить Readme
+* [ ] Допилить Readme
+* [ ] ActiveAdmin: Settings: решить вопрос, почему не хочет обновлять данные в базе "из коробки",
+пришлось лепить контроллер, и времени не хватило, не показывает ошибки валидации.

data/app/admin/c80_contest/bids.rb

@@ -17,16 +17,42 @@ ActiveAdmin.register C80Contest::Bid, :as => 'Bid' do
 
   index do
     id_column
-    column :created_at
+    column :created_at do |bid|
+      l(bid.created_at.in_time_zone('Moscow'), {:format => '%Y-%b-%d [%H:%M:%S]'})
+    end
     column :title
     column :phone
     column :photo do |bid|
       if bid.photo.present?
-        link_to image_tag(bid.photo.thumb.url), bid.photo.url
+        # link_to image_tag(bid.photo.thumb.url), bid.photo.url
+        thumb_base_file_name = File.basename(bid.photo.thumb.url)
+        base_file_name = File.basename(bid.photo.url)
+        link_to image_tag("/uploads/bids/#{thumb_base_file_name}"),
+                "/uploads/bids/#{base_file_name}"
       end
     end
 
     actions
   end
 
+  show do
+    attributes_table do
+      row :title
+      row :phone
+      row :created_at do |bid|
+        # bid.created_at.in_time_zone('Moscow').strftime('%Y-%b-%d %H:%M:%S')
+        l(bid.created_at.in_time_zone('Moscow'), {:format => '%Y-%b-%d [%H:%M:%S]'})
+      end
+      row :photo do |bid|
+        if bid.photo.present?
+          # link_to image_tag(bid.photo.thumb.url), bid.photo.url
+          thumb_base_file_name = File.basename(bid.photo.thumb.url)
+          base_file_name = File.basename(bid.photo.url)
+          link_to image_tag("/uploads/bids/#{thumb_base_file_name}"),
+                  "/uploads/bids/#{base_file_name}"
+        end
+      end
+    end
+  end
+
 end

data/app/controllers/c80_contest/application_controller.rb

@@ -1,6 +1,7 @@
 module C80Contest
-  class ApplicationController < ActionController::Base
-    protect_from_forgery with: :exception
+  # This line will inherit from the host applications ApplicationController,
+  # giving access to your authentication, current_user, etc...
+  class ApplicationController < ::ApplicationController
 
     # noinspection RubyResolve
     before_filter :check_is_active

data/app/controllers/c80_contest/bid_photos_controller.rb

@@ -0,0 +1,10 @@
+module C80Contest
+  class BidPhotosController < ApplicationController
+    before_filter :authenticate_user!
+    skip_before_filter :verify_authenticity_token
+    def image
+      path = "uploads/bids/#{params[:file_name]}.#{params[:ext]}"
+      send_file path, :x_sendfile => true, :disposition => :inline
+    end
+  end
+end

data/app/uploaders/c80_contest/bid_photo_uploader.rb

@@ -12,7 +12,7 @@ module C80Contest
     end
 
     def store_dir
-      'uploads/bids/'
+      "#{Rails.root}/uploads/bids/"
     end
 
     def filename

data/c80_contest.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bootstrap-sass', '>= 3.3.5.1'
   spec.add_development_dependency 'sass-rails', '>= 5.0.4'
   spec.add_development_dependency 'c80_modal_forms', '~> 0.1.0.1'
-  spec.add_dependency 'byebug', '~> 9.0.6'
+  # spec.add_dependency 'byebug', '~> 9.0.6'
 
   # spec.add_development_dependency 'combustion', '~> 0.6.0'
 

data/config/routes.rb

@@ -2,4 +2,7 @@ C80Contest::Engine.routes.draw do
   match '/give_me_bid_form', :to => 'site#give_me_form', :via => :post, :defaults => { :format => 'js' }
   match '/make_bid', :to => 'bid#make_bid', :via => :post, :defaults => { :format => 'js' }
   match '/rules_page', :to => 'pages#rules_page', :via => :get
+
+  get '/uploads/bids/:file_name.:ext', :to => 'bid_photos#image'
+
 end

data/custom_plan.rb

@@ -0,0 +1,11 @@
+require 'zeus/rails'
+
+class CustomPlan < Zeus::Rails
+
+  # def my_custom_command
+  #  # see https://github.com/burke/zeus/blob/master/docs/ruby/modifying.md
+  # end
+
+end
+
+Zeus.plan = CustomPlan.new

data/engine_plan.rb

@@ -0,0 +1,14 @@
+require 'zeus/rails'
+
+ROOT_PATH = File.expand_path(Dir.pwd)
+ENVIRONMENT_PATH  = File.expand_path('spec/dummy/config/environment', ROOT_PATH)
+ENV_PATH  = File.expand_path('spec/dummy/config/environment', ROOT_PATH)
+BOOT_PATH = File.expand_path('spec/dummy/config/boot', ROOT_PATH)
+APP_PATH  = File.expand_path('spec/dummy/config/application', ROOT_PATH)
+ENGINE_ROOT = File.expand_path(Dir.pwd)
+ENGINE_PATH = File.expand_path('lib/c80_contest/engine', ENGINE_ROOT)
+
+class EnginePlan < Zeus::Rails
+end
+
+Zeus.plan = EnginePlan.new

data/lib/c80_contest.rb

@@ -1,6 +1,6 @@
 require 'c80_contest/version'
 require 'c80_contest/engine'
-require 'byebug'
+# require 'byebug'
 
 module C80Contest
   def self.table_name_prefix

data/lib/c80_contest/version.rb

@@ -1,3 +1,3 @@
 module C80Contest
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/zeus.json

@@ -0,0 +1,15 @@
+{
+  "command": "ruby -rubygems -r./engine_plan -eZeus.go",
+
+  "plan": {
+    "boot": {
+      "default_bundle": {
+        "development_environment": {
+        },
+        "test_environment": {
+          "test_helper": {"test": ["rspec", "testrb"]}
+        }
+      }
+    }
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_contest
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -234,20 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0.1
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 9.0.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 9.0.6
 description: Пришли чек и участвуй в розыгрыше 500 литров бензина
 email:
 - c080609a@gmail.com
@@ -262,6 +248,7 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - MIT-LICENSE
 - README.md
@@ -286,6 +273,7 @@ files:
 - app/assets/stylesheets/lib/fileinput/themes/explorer/theme.scss
 - app/controllers/c80_contest/application_controller.rb
 - app/controllers/c80_contest/bid_controller.rb
+- app/controllers/c80_contest/bid_photos_controller.rb
 - app/controllers/c80_contest/pages_controller.rb
 - app/controllers/c80_contest/site_controller.rb
 - app/helpers/c80_contest/application_helper.rb
@@ -308,6 +296,7 @@ files:
 - c80_contest.gemspec
 - config/routes.rb
 - create_base.rb
+- custom_plan.rb
 - db/migrate/20170510124400_create_c80_contest_bids.rb
 - db/migrate/20170511145501_create_c80_contest_settings.rb
 - db/migrate/20170512114103_add_c80_contest_admin_labels_to_settings.rb
@@ -315,10 +304,12 @@ files:
 - db/migrate/20170518165005_add_c80_contest_is_active_to_settings.rb
 - db/migrate/20170518191906_add_c80_contest_button_photo_to_settings.rb
 - db/seeds/c80_contest_fill_settings.rb
+- engine_plan.rb
 - lib/c80_contest.rb
 - lib/c80_contest/engine.rb
 - lib/c80_contest/version.rb
 - lib/tasks/c80_contest_tasks.rake
+- zeus.json
 homepage: https://github.com/c80609a/c80_contest
 licenses:
 - MIT