annex-cms 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 024ade0ac1caccb177d71048c7172c81725644bb
-  data.tar.gz: 7743d1248bc142405b35c4d590567d3509ccedf5
+  metadata.gz: f422eaac34d49d4e56c7cb94467ef9ecd143784c
+  data.tar.gz: d20e1e5c2f759333f59c94bc1506aa28214cadc5
 SHA512:
-  metadata.gz: e62aa93d19fc243e9caece0c4fa7821566cd79978f98127cd80e3a74ee7fd504fd8e18c6261dd39befed0a07745bfd7d7f320bc05c276b0606daaf9e5205371e
-  data.tar.gz: 45e7f037e099d03553f2b4abd9489af45b79d2e3080f2a3cd43f6a4101ad0f7864567f2474b89b64e386bbd6c38ff01ec328a6e7083c31ee8bd30d8d66e058ad
+  metadata.gz: 92308f85a5a19d46a0ce54f666caa1bdd0f7411d70aa210452ac8f1a8f00ca2707f99885efa49f66a18db5211c0f11555c0b533b9aabe715cb3467e5a2730c1b
+  data.tar.gz: 5d88573875acbb3cc6399c960f5c1f8ab7f4f7fa49f4c56254f3c11f25c76be9fc8632b88e94a1f635c54d6b2034113e30499822bf6412fc79925d4f8e4e9f78

data/app/assets/javascripts/annex/jquery.redactor.save.js

@@ -57,6 +57,7 @@ RedactorPlugins.save = function()
         type: 'POST',
         url: post_url,
         data: {
+          identifier: identifier,
           route: route,
           content: html_content
         },

data/app/assets/stylesheets/annex.css.scss

@@ -9,4 +9,10 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require annex/redactor
- */
+ */
+
+.redactor {
+  box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.1);
+  display: block;
+  min-height: 20px;
+}

data/app/controllers/annex/blocks_controller.rb

@@ -5,15 +5,10 @@ module Annex
 
     # POST /annex/blocks
     def create
-      @block = Block.where(:route => params[:route]).first_or_create
-      @block.content ||= {}
-
-      params[:content].keys.each do |key|
-        @block.content[key] = params[:content][key]
-      end
+      @block = Block.builder(params)
 
       if @block.save
-        render json: {status: :success}, status: :ok
+        render json: { status: :success }, status: :ok
       else
         render json: @block.errors, status: :unprocessable_entity
       end

data/app/models/annex/block.rb

@@ -1,17 +1,47 @@
+#
+# Block Model
+#
+# Stores the raw information in the database
+#
 module Annex
-  #
-  # Block Model
-  #
-  # Stores the raw information in the database
-  #
-  class Block
-    include Mongoid::Document
-    include Mongoid::Timestamps
-    include Mongoid::Attributes::Dynamic
-
-    field :route, type: String
-    field :content, type: Hash
-
-    validates_presence_of :route
+
+  case Annex::config[:adapter]
+
+  when :activerecord
+    class Block < ActiveRecord::Base
+      validates_presence_of :route
+
+      def self.builder(params)
+        puts params.inspect.red
+
+        block = Block.where(route: "#{params[:route]}_#{params[:identifier]}").first_or_create
+        block.content = params[:content][params[:identifier].to_sym]
+
+        puts params[:content][params[:identifier].to_sym].inspect.red
+
+        return block
+      end
+    end
+
+  when :mongoid
+    class Block
+      field :route, type: String
+      field :content, type: Hash
+
+      validates_presence_of :route
+
+      def self.builder(params)
+        block = Block.where(route: params[:route]).first_or_create
+
+        block.content ||= {}
+
+        params[:content].keys.each do |key|
+          block.content[key] = params[:content][key]
+        end
+
+        return block
+      end
+    end
   end
+
 end

data/db/migrate/20141118200937_annex_block.rb

@@ -0,0 +1,8 @@
+class AnnexBlock < ActiveRecord::Migration
+  def change
+    create_table :annex_blocks do |t|
+      t.string :route
+      t.text :content
+    end
+  end
+end

data/lib/annex/config.rb

@@ -82,6 +82,10 @@ module Annex
         @authorize || DEFAULT_AUTHORIZE
       end
 
+      def connect_with(adapter = :activerecord)
+        @adapter = adapter
+      end
+
     end
   end
 end

data/lib/annex/version.rb

@@ -2,5 +2,5 @@
 # Annex
 #
 module Annex
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/annex/view_helpers.rb

@@ -1,5 +1,3 @@
-require 'active_support/hash_with_indifferent_access'
-
 module Annex
   #
   # Create global view helpers
@@ -7,18 +5,24 @@ module Annex
   module ViewHelpers
     #
     # annex_block is a universal helper to render content from
-    # mongodb and display it on the page
-    #
-    # @TODO: implement caching
+    # the database and display it on the page
     #
     def annex_block(identifier, opts = {})
       opts[:route] ||= current_route
 
-      doc = Annex::Block.where(route: opts[:route]).first_or_create
+      case Annex::config[:adapter]
+
+      when :activerecord
+        doc = Annex::Block.where(route: "#{opts[:route]}_#{identifier}").first_or_create
+        content = doc.content
+
+      when :mongoid
+        doc = Annex::Block.where(route: opts[:route]).first_or_create
+        content = doc.content.try(:[], identifier.to_s)
 
-      content = doc.content.try(:[], identifier.to_s) || opts[:default]
+      end
 
-      render partial: 'annex/block', locals: { content: content, identifier: identifier, opts: opts }
+      render partial: 'annex/block', locals: { content: content || opts[:default], identifier: identifier, opts: opts }
     end
 
     def current_route

data/lib/annex-cms.rb

@@ -5,4 +5,32 @@ require 'annex/extensions/cancan'
 require 'annex/railtie'
 
 module Annex
+  # Configuration defaults
+  @config = {
+    adapter: :activerecord
+  }
+
+  @valid_config_keys = @config.keys
+
+  # Configure through hash
+  def self.configure(opts = {})
+    opts.each { |k,v| @config[k.to_sym] = v if @valid_config_keys.include? k.to_sym }
+  end
+
+  # Configure through yaml file
+  def self.configure_with(path_to_yaml_file)
+    begin
+      config = YAML::load(IO.read(path_to_yaml_file))
+    rescue Errno::ENOENT
+      log(:warning, "YAML configuration file couldn't be found. Using defaults."); return
+    rescue Psych::SyntaxError
+      log(:warning, "YAML configuration file contains invalid syntax. Using defaults."); return
+    end
+
+    configure(config)
+  end
+
+  def self.config
+    @config
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: annex-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Clay McIlrath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: An inline editor CMS powered by redactor, devise and mongodb. Up and
   running in seconds
 email:
@@ -65,11 +51,10 @@ files:
 - app/assets/stylesheets/annex/redactor.css.scss
 - app/controllers/annex/application_controller.rb
 - app/controllers/annex/blocks_controller.rb
-- app/controllers/annex/files_controller.rb
 - app/models/annex/block.rb
-- app/models/annex/file.rb
 - app/views/annex/_block.html.haml
 - config/routes.rb
+- db/migrate/20141118200937_annex_block.rb
 - lib/annex-cms.rb
 - lib/annex/config.rb
 - lib/annex/engine.rb

data/app/controllers/annex/files_controller.rb

@@ -1,12 +0,0 @@
-require_dependency "annex/application_controller"
-
-module Annex
-  class FilesController < ApplicationController
-
-    # POST /annex/documents
-    def create
-      puts 'create called'
-    end
-
-  end
-end

data/app/models/annex/file.rb

@@ -1,7 +0,0 @@
-module Annex
-  class File
-    include Mongoid::Document
-    include Mongoid::Timestamps
-    include Mongoid::Attributes::Dynamic
-  end
-end